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
/
arm
/
mach-aaec2000
/
core.c
diff --git
a/arch/arm/mach-aaec2000/core.c
b/arch/arm/mach-aaec2000/core.c
index
dce4815
..
a950160
100644
(file)
--- a/
arch/arm/mach-aaec2000/core.c
+++ b/
arch/arm/mach-aaec2000/core.c
@@
-9,7
+9,6
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-20,7
+19,6
@@
#include <linux/interrupt.h>
#include <linux/timex.h>
#include <linux/signal.h>
#include <linux/interrupt.h>
#include <linux/timex.h>
#include <linux/signal.h>
-#include <linux/amba/bus.h>
#include <asm/hardware.h>
#include <asm/irq.h>
#include <asm/hardware.h>
#include <asm/irq.h>
@@
-50,12
+48,12
@@
static struct map_desc standard_io_desc[] __initdata = {
{
.virtual = VIO_APB_BASE,
static struct map_desc standard_io_desc[] __initdata = {
{
.virtual = VIO_APB_BASE,
- .p
hysical
= __phys_to_pfn(PIO_APB_BASE),
+ .p
fn
= __phys_to_pfn(PIO_APB_BASE),
.length = IO_APB_LENGTH,
.type = MT_DEVICE
}, {
.virtual = VIO_AHB_BASE,
.length = IO_APB_LENGTH,
.type = MT_DEVICE
}, {
.virtual = VIO_AHB_BASE,
- .p
hysical
= __phys_to_pfn(PIO_AHB_BASE),
+ .p
fn
= __phys_to_pfn(PIO_AHB_BASE),
.length = IO_AHB_LENGTH,
.type = MT_DEVICE
}
.length = IO_AHB_LENGTH,
.type = MT_DEVICE
}
@@
-84,7
+82,7
@@
static void aaec2000_int_unmask(unsigned int irq)
IRQ_INTENS |= (1 << irq);
}
IRQ_INTENS |= (1 << irq);
}
-static struct irqchip aaec2000_irq_chip = {
+static struct irq
_
chip aaec2000_irq_chip = {
.ack = aaec2000_int_ack,
.mask = aaec2000_int_mask,
.unmask = aaec2000_int_unmask,
.ack = aaec2000_int_ack,
.mask = aaec2000_int_mask,
.unmask = aaec2000_int_unmask,
@@
-95,7
+93,7
@@
void __init aaec2000_init_irq(void)
unsigned int i;
for (i = 0; i < NR_IRQS; i++) {
unsigned int i;
for (i = 0; i < NR_IRQS; i++) {
- set_irq_handler(i,
do_level_IRQ
);
+ set_irq_handler(i,
handle_level_irq
);
set_irq_chip(i, &aaec2000_irq_chip);
set_irq_flags(i, IRQF_VALID);
}
set_irq_chip(i, &aaec2000_irq_chip);
set_irq_flags(i, IRQF_VALID);
}
@@
-129,12
+127,12
@@
static unsigned long aaec2000_gettimeoffset(void)
/* We enter here with IRQs enabled */
static irqreturn_t
/* We enter here with IRQs enabled */
static irqreturn_t
-aaec2000_timer_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+aaec2000_timer_interrupt(int irq, void *dev_id)
{
/* TODO: Check timer accuracy */
write_seqlock(&xtime_lock);
{
/* TODO: Check timer accuracy */
write_seqlock(&xtime_lock);
- timer_tick(
regs
);
+ timer_tick();
TIMER1_CLEAR = 1;
write_sequnlock(&xtime_lock);
TIMER1_CLEAR = 1;
write_sequnlock(&xtime_lock);
@@
-144,7
+142,7
@@
aaec2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction aaec2000_timer_irq = {
.name = "AAEC-2000 Timer Tick",
static struct irqaction aaec2000_timer_irq = {
.name = "AAEC-2000 Timer Tick",
- .flags =
SA_INTERRUPT | SA
_TIMER,
+ .flags =
IRQF_DISABLED | IRQF
_TIMER,
.handler = aaec2000_timer_interrupt,
};
.handler = aaec2000_timer_interrupt,
};