git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull novell-bugzilla-156426 into release branch
[pandora-kernel.git]
/
arch
/
ppc
/
syslib
/
open_pic.c
diff --git
a/arch/ppc/syslib/open_pic.c
b/arch/ppc/syslib/open_pic.c
index
1cf5de2
..
70456c8
100644
(file)
--- a/
arch/ppc/syslib/open_pic.c
+++ b/
arch/ppc/syslib/open_pic.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/kernel/open_pic.c -- OpenPIC Interrupt Handling
- *
* Copyright (C) 1997 Geert Uytterhoeven
*
* This file is subject to the terms and conditions of the GNU General Public
* Copyright (C) 1997 Geert Uytterhoeven
*
* This file is subject to the terms and conditions of the GNU General Public
@@
-23,6
+21,7
@@
#include <asm/sections.h>
#include <asm/open_pic.h>
#include <asm/i8259.h>
#include <asm/sections.h>
#include <asm/open_pic.h>
#include <asm/i8259.h>
+#include <asm/machdep.h>
#include "open_pic_defs.h"
#include "open_pic_defs.h"
@@
-217,7
+216,7
@@
static void openpic_safe_writefield(volatile u_int __iomem *addr, u_int mask,
u_int openpic_read_IPI(volatile u_int __iomem * addr)
{
u_int val = 0;
u_int openpic_read_IPI(volatile u_int __iomem * addr)
{
u_int val = 0;
-#if defined(OPENPIC_BIG_ENDIAN)
|| defined(CONFIG_POWER3)
+#if defined(OPENPIC_BIG_ENDIAN)
val = in_be32(addr);
#else
val = in_le32(addr);
val = in_be32(addr);
#else
val = in_le32(addr);
@@
-889,7
+888,7
@@
openpic_get_irq(struct pt_regs *regs)
#ifdef CONFIG_SMP
void
#ifdef CONFIG_SMP
void
-smp_openpic_message_pass(int target, int msg
, unsigned long data, int wait
)
+smp_openpic_message_pass(int target, int msg)
{
cpumask_t mask = CPU_MASK_ALL;
/* make sure we're sending something that translates to an IPI */
{
cpumask_t mask = CPU_MASK_ALL;
/* make sure we're sending something that translates to an IPI */