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]
/
arch
/
ppc
/
syslib
/
ibm440gx_common.c
diff --git
a/arch/ppc/syslib/ibm440gx_common.c
b/arch/ppc/syslib/ibm440gx_common.c
index
f6cc168
..
6ad52f4
100644
(file)
--- a/
arch/ppc/syslib/ibm440gx_common.c
+++ b/
arch/ppc/syslib/ibm440gx_common.c
@@
-10,7
+10,6
@@
* option) any later version.
*
*/
* option) any later version.
*
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/interrupt.h>
#include <asm/ibm44x.h>
#include <linux/kernel.h>
#include <linux/interrupt.h>
#include <asm/ibm44x.h>
@@
-120,7
+119,7
@@
static inline u32 l2c_diag(u32 addr)
return mfdcr(DCRN_L2C0_DATA);
}
return mfdcr(DCRN_L2C0_DATA);
}
-static irqreturn_t l2c_error_handler(int irq, void* dev
, struct pt_regs* regs
)
+static irqreturn_t l2c_error_handler(int irq, void* dev)
{
u32 sr = mfdcr(DCRN_L2C0_SR);
if (sr & L2C_SR_CPE){
{
u32 sr = mfdcr(DCRN_L2C0_SR);
if (sr & L2C_SR_CPE){
@@
-150,7
+149,7
@@
void __init ibm440gx_l2c_enable(void){
unsigned long flags;
/* Install error handler */
unsigned long flags;
/* Install error handler */
- if (request_irq(87, l2c_error_handler,
SA_INTERRUPT
, "L2C", 0) < 0){
+ if (request_irq(87, l2c_error_handler,
IRQF_DISABLED
, "L2C", 0) < 0){
printk(KERN_ERR "Cannot install L2C error handler, cache is not enabled\n");
return;
}
printk(KERN_ERR "Cannot install L2C error handler, cache is not enabled\n");
return;
}