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
vserver 2.0 rc7
[linux-2.6.git]
/
include
/
asm-arm
/
arch-ixp2000
/
system.h
diff --git
a/include/asm-arm/arch-ixp2000/system.h
b/include/asm-arm/arch-ixp2000/system.h
index
f9eb8ad
..
4f489cc
100644
(file)
--- a/
include/asm-arm/arch-ixp2000/system.h
+++ b/
include/asm-arm/arch-ixp2000/system.h
@@
-19,7
+19,7
@@
static inline void arch_idle(void)
static inline void arch_reset(char mode)
{
-
cli
();
+
local_irq_disable
();
/*
* Reset flash banking register so that we are pointing at