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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
pal4_setup.c
diff --git
a/arch/ppc/platforms/pal4_setup.c
b/arch/ppc/platforms/pal4_setup.c
index
74dea79
..
3c3d881
100644
(file)
--- a/
arch/ppc/platforms/pal4_setup.c
+++ b/
arch/ppc/platforms/pal4_setup.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/pal4_setup.c
- *
* Board setup routines for the SBS PalomarIV.
*
* Author: Dan Cox
* Board setup routines for the SBS PalomarIV.
*
* Author: Dan Cox
@@
-28,6
+26,7
@@
#include <asm/io.h>
#include <asm/todc.h>
#include <asm/bootinfo.h>
#include <asm/io.h>
#include <asm/todc.h>
#include <asm/bootinfo.h>
+#include <asm/machdep.h>
#include <syslib/cpc700.h>
#include <syslib/cpc700.h>
@@
-81,7
+80,7
@@
pal4_show_cpuinfo(struct seq_file *m)
static void
pal4_restart(char *cmd)
{
static void
pal4_restart(char *cmd)
{
-
__cli
();
+
local_irq_disable
();
__asm__ __volatile__("lis 3,0xfff0\n \
ori 3,3,0x100\n \
mtspr 26,3\n \
__asm__ __volatile__("lis 3,0xfff0\n \
ori 3,3,0x100\n \
mtspr 26,3\n \
@@
-95,7
+94,7
@@
pal4_restart(char *cmd)
static void
pal4_power_off(void)
{
static void
pal4_power_off(void)
{
-
__cli
();
+
local_irq_disable
();
for(;;);
}
for(;;);
}