git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-mips
/
asmmacro.h
diff --git
a/include/asm-mips/asmmacro.h
b/include/asm-mips/asmmacro.h
index
f54aa14
..
92e62ef
100644
(file)
--- a/
include/asm-mips/asmmacro.h
+++ b/
include/asm-mips/asmmacro.h
@@
-8,7
+8,6
@@
#ifndef _ASM_ASMMACRO_H
#define _ASM_ASMMACRO_H
#ifndef _ASM_ASMMACRO_H
#define _ASM_ASMMACRO_H
-#include <linux/config.h>
#include <asm/hazards.h>
#ifdef CONFIG_32BIT
#include <asm/hazards.h>
#ifdef CONFIG_32BIT
@@
-27,14
+26,14
@@
ori \reg, \reg, TCSTATUS_IXMT
xori \reg, \reg, TCSTATUS_IXMT
mtc0 \reg, CP0_TCSTATUS
ori \reg, \reg, TCSTATUS_IXMT
xori \reg, \reg, TCSTATUS_IXMT
mtc0 \reg, CP0_TCSTATUS
- ehb
+
_
ehb
.endm
.macro local_irq_disable reg=t0
mfc0 \reg, CP0_TCSTATUS
ori \reg, \reg, TCSTATUS_IXMT
mtc0 \reg, CP0_TCSTATUS
.endm
.macro local_irq_disable reg=t0
mfc0 \reg, CP0_TCSTATUS
ori \reg, \reg, TCSTATUS_IXMT
mtc0 \reg, CP0_TCSTATUS
- ehb
+
_
ehb
.endm
#else
.macro local_irq_enable reg=t0
.endm
#else
.macro local_irq_enable reg=t0