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

Commit 8716a763 authored by Markos Chandras's avatar Markos Chandras
Browse files

MIPS: asm: irqflags: Add MIPS R6 related definitions 



Add the MIPS R6 related definitions to the IRQ related macros

Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
parent f52fca97

arch/mips/include/asm/irqflags.h

+4 −3
Original line number Original line Diff line number Diff line
@@ -15,9 +15,10 @@ 




#include <linux/compiler.h>

#include <linux/compiler.h>

#include <linux/stringify.h>

#include <linux/stringify.h>

#include <asm/compiler.h>

#include <asm/hazards.h>

#include <asm/hazards.h>





#ifdef CONFIG_CPU_MIPSR2

#if defined(CONFIG_CPU_MIPSR2) || defined (CONFIG_CPU_MIPSR6)





static inline void arch_local_irq_disable(void)

static inline void arch_local_irq_disable(void)

{

{
@@ -118,7 +119,7 @@ void arch_local_irq_disable(void); 
unsigned long arch_local_irq_save(void);

unsigned long arch_local_irq_save(void);

void arch_local_irq_restore(unsigned long flags);

void arch_local_irq_restore(unsigned long flags);

void __arch_local_irq_restore(unsigned long flags);

void __arch_local_irq_restore(unsigned long flags);

#endif /* CONFIG_CPU_MIPSR2 */

#endif /* CONFIG_CPU_MIPSR2 || CONFIG_CPU_MIPSR6 */





static inline void arch_local_irq_enable(void)

static inline void arch_local_irq_enable(void)

{

{
@@ -126,7 +127,7 @@ static inline void arch_local_irq_enable(void) 
	"	.set	push						\n"

	"	.set	push						\n"

	"	.set	reorder						\n"

	"	.set	reorder						\n"

	"	.set	noat						\n"

	"	.set	noat						\n"

#if   defined(CONFIG_CPU_MIPSR2)

#if   defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)

	"	ei							\n"

	"	ei							\n"

#else

#else

	"	mfc0	$1,$12						\n"

	"	mfc0	$1,$12						\n"

arch/mips/lib/mips-atomic.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/export.h>

#include <linux/export.h>

#include <linux/stringify.h>

#include <linux/stringify.h>





#ifndef CONFIG_CPU_MIPSR2

#if !defined(CONFIG_CPU_MIPSR2) && !defined(CONFIG_CPU_MIPSR6)





/*

/*

 * For cli() we have to insert nops to make sure that the new value

 * For cli() we have to insert nops to make sure that the new value