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
/
alpha
/
kernel
/
sys_cabriolet.c
diff --git
a/arch/alpha/kernel/sys_cabriolet.c
b/arch/alpha/kernel/sys_cabriolet.c
index
568feb8
..
ace475c
100644
(file)
--- a/
arch/alpha/kernel/sys_cabriolet.c
+++ b/
arch/alpha/kernel/sys_cabriolet.c
@@
-9,19
+9,18
@@
* PC164 and LX164.
*/
* PC164 and LX164.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/bitops.h>
#include <asm/ptrace.h>
#include <asm/system.h>
#include <asm/dma.h>
#include <asm/irq.h>
#include <asm/ptrace.h>
#include <asm/system.h>
#include <asm/dma.h>
#include <asm/irq.h>
-#include <asm/bitops.h>
#include <asm/mmu_context.h>
#include <asm/io.h>
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
#include <asm/io.h>
#include <asm/pgtable.h>
@@
-83,7
+82,7
@@
static struct hw_interrupt_type cabriolet_irq_type = {
};
static void
};
static void
-cabriolet_device_interrupt(unsigned long v
, struct pt_regs *r
)
+cabriolet_device_interrupt(unsigned long v)
{
unsigned long pld;
unsigned int i;
{
unsigned long pld;
unsigned int i;
@@
-99,15
+98,15
@@
cabriolet_device_interrupt(unsigned long v, struct pt_regs *r)
i = ffz(~pld);
pld &= pld - 1; /* clear least bit set */
if (i == 4) {
i = ffz(~pld);
pld &= pld - 1; /* clear least bit set */
if (i == 4) {
- isa_device_interrupt(v
, r
);
+ isa_device_interrupt(v);
} else {
} else {
- handle_irq(16 + i
, r
);
+ handle_irq(16 + i);
}
}
}
static void __init
}
}
}
static void __init
-common_init_irq(void (*srm_dev_int)(unsigned long v
, struct pt_regs *r
))
+common_init_irq(void (*srm_dev_int)(unsigned long v))
{
init_i8259a_irqs();
{
init_i8259a_irqs();
@@
-124,7
+123,7
@@
common_init_irq(void (*srm_dev_int)(unsigned long v, struct pt_regs *r))
for (i = 16; i < 35; ++i) {
irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
for (i = 16; i < 35; ++i) {
irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
- irq_desc[i].
handler
= &cabriolet_irq_type;
+ irq_desc[i].
chip
= &cabriolet_irq_type;
}
}
}
}
@@
-155,18
+154,18
@@
cabriolet_init_irq(void)
too invasive though. */
static void
too invasive though. */
static void
-pc164_srm_device_interrupt(unsigned long v
, struct pt_regs *r
)
+pc164_srm_device_interrupt(unsigned long v)
{
__min_ipl = getipl();
{
__min_ipl = getipl();
- srm_device_interrupt(v
, r
);
+ srm_device_interrupt(v);
__min_ipl = 0;
}
static void
__min_ipl = 0;
}
static void
-pc164_device_interrupt(unsigned long v
, struct pt_regs *r
)
+pc164_device_interrupt(unsigned long v)
{
__min_ipl = getipl();
{
__min_ipl = getipl();
- cabriolet_device_interrupt(v
, r
);
+ cabriolet_device_interrupt(v);
__min_ipl = 0;
}
__min_ipl = 0;
}
@@
-327,7
+326,6
@@
struct alpha_machine_vector cabriolet_mv __initmv = {
DO_EV4_MMU,
DO_DEFAULT_RTC,
DO_APECS_IO,
DO_EV4_MMU,
DO_DEFAULT_RTC,
DO_APECS_IO,
- DO_APECS_BUS,
.machine_check = apecs_machine_check,
.max_isa_dma_address = ALPHA_MAX_ISA_DMA_ADDRESS,
.min_io_address = DEFAULT_IO_BASE,
.machine_check = apecs_machine_check,
.max_isa_dma_address = ALPHA_MAX_ISA_DMA_ADDRESS,
.min_io_address = DEFAULT_IO_BASE,
@@
-354,7
+352,6
@@
struct alpha_machine_vector eb164_mv __initmv = {
DO_EV5_MMU,
DO_DEFAULT_RTC,
DO_CIA_IO,
DO_EV5_MMU,
DO_DEFAULT_RTC,
DO_CIA_IO,
- DO_CIA_BUS,
.machine_check = cia_machine_check,
.max_isa_dma_address = ALPHA_MAX_ISA_DMA_ADDRESS,
.min_io_address = DEFAULT_IO_BASE,
.machine_check = cia_machine_check,
.max_isa_dma_address = ALPHA_MAX_ISA_DMA_ADDRESS,
.min_io_address = DEFAULT_IO_BASE,
@@
-380,7
+377,6
@@
struct alpha_machine_vector eb66p_mv __initmv = {
DO_EV4_MMU,
DO_DEFAULT_RTC,
DO_LCA_IO,
DO_EV4_MMU,
DO_DEFAULT_RTC,
DO_LCA_IO,
- DO_LCA_BUS,
.machine_check = lca_machine_check,
.max_isa_dma_address = ALPHA_MAX_ISA_DMA_ADDRESS,
.min_io_address = DEFAULT_IO_BASE,
.machine_check = lca_machine_check,
.max_isa_dma_address = ALPHA_MAX_ISA_DMA_ADDRESS,
.min_io_address = DEFAULT_IO_BASE,
@@
-405,7
+401,6
@@
struct alpha_machine_vector lx164_mv __initmv = {
DO_EV5_MMU,
DO_DEFAULT_RTC,
DO_PYXIS_IO,
DO_EV5_MMU,
DO_DEFAULT_RTC,
DO_PYXIS_IO,
- DO_CIA_BUS,
.machine_check = cia_machine_check,
.max_isa_dma_address = ALPHA_MAX_ISA_DMA_ADDRESS,
.min_io_address = DEFAULT_IO_BASE,
.machine_check = cia_machine_check,
.max_isa_dma_address = ALPHA_MAX_ISA_DMA_ADDRESS,
.min_io_address = DEFAULT_IO_BASE,
@@
-432,7
+427,6
@@
struct alpha_machine_vector pc164_mv __initmv = {
DO_EV5_MMU,
DO_DEFAULT_RTC,
DO_CIA_IO,
DO_EV5_MMU,
DO_DEFAULT_RTC,
DO_CIA_IO,
- DO_CIA_BUS,
.machine_check = cia_machine_check,
.max_isa_dma_address = ALPHA_MAX_ISA_DMA_ADDRESS,
.min_io_address = DEFAULT_IO_BASE,
.machine_check = cia_machine_check,
.max_isa_dma_address = ALPHA_MAX_ISA_DMA_ADDRESS,
.min_io_address = DEFAULT_IO_BASE,