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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
alpha
/
kernel
/
sys_mikasa.c
diff --git
a/arch/alpha/kernel/sys_mikasa.c
b/arch/alpha/kernel/sys_mikasa.c
index
d78a0da
..
8d3e942
100644
(file)
--- a/
arch/alpha/kernel/sys_mikasa.c
+++ b/
arch/alpha/kernel/sys_mikasa.c
@@
-8,7
+8,6
@@
* Code supporting the MIKASA (AlphaServer 1000).
*/
* Code supporting the MIKASA (AlphaServer 1000).
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/mm.h>
@@
-80,7
+79,7
@@
static struct hw_interrupt_type mikasa_irq_type = {
};
static void
};
static void
-mikasa_device_interrupt(unsigned long vector
, struct pt_regs *regs
)
+mikasa_device_interrupt(unsigned long vector)
{
unsigned long pld;
unsigned int i;
{
unsigned long pld;
unsigned int i;
@@
-98,9
+97,9
@@
mikasa_device_interrupt(unsigned long vector, struct pt_regs *regs)
i = ffz(~pld);
pld &= pld - 1; /* clear least bit set */
if (i < 16) {
i = ffz(~pld);
pld &= pld - 1; /* clear least bit set */
if (i < 16) {
- isa_device_interrupt(vector
, regs
);
+ isa_device_interrupt(vector);
} else {
} else {
- handle_irq(i
, regs
);
+ handle_irq(i);
}
}
}
}
}
}
@@
-117,7
+116,7
@@
mikasa_init_irq(void)
for (i = 16; i < 32; ++i) {
irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
for (i = 16; i < 32; ++i) {
irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
- irq_desc[i].
handler
= &mikasa_irq_type;
+ irq_desc[i].
chip
= &mikasa_irq_type;
}
init_i8259a_irqs();
}
init_i8259a_irqs();
@@
-183,8
+182,7
@@
mikasa_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
#if defined(CONFIG_ALPHA_GENERIC) || !defined(CONFIG_ALPHA_PRIMO)
static void
#if defined(CONFIG_ALPHA_GENERIC) || !defined(CONFIG_ALPHA_PRIMO)
static void
-mikasa_apecs_machine_check(unsigned long vector, unsigned long la_ptr,
- struct pt_regs * regs)
+mikasa_apecs_machine_check(unsigned long vector, unsigned long la_ptr)
{
#define MCHK_NO_DEVSEL 0x205U
#define MCHK_NO_TABT 0x204U
{
#define MCHK_NO_DEVSEL 0x205U
#define MCHK_NO_TABT 0x204U
@@
-203,7
+201,7
@@
mikasa_apecs_machine_check(unsigned long vector, unsigned long la_ptr,
mb();
code = mchk_header->code;
mb();
code = mchk_header->code;
- process_mcheck_info(vector, la_ptr,
regs,
"MIKASA APECS",
+ process_mcheck_info(vector, la_ptr, "MIKASA APECS",
(mcheck_expected(0)
&& (code == MCHK_NO_DEVSEL
|| code == MCHK_NO_TABT)));
(mcheck_expected(0)
&& (code == MCHK_NO_DEVSEL
|| code == MCHK_NO_TABT)));