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
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
[pandora-kernel.git]
/
arch
/
arm
/
mach-shark
/
core.c
diff --git
a/arch/arm/mach-shark/core.c
b/arch/arm/mach-shark/core.c
index
946c0d1
..
0e480fa
100644
(file)
--- a/
arch/arm/mach-shark/core.c
+++ b/
arch/arm/mach-shark/core.c
@@
-6,6
+6,7
@@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <linux/sched.h>
#include <linux/serial_8250.h>
#include <linux/sched.h>
#include <linux/serial_8250.h>
@@
-62,7
+63,12
@@
arch_initcall(shark_init);
extern void shark_init_irq(void);
static struct map_desc shark_io_desc[] __initdata = {
extern void shark_init_irq(void);
static struct map_desc shark_io_desc[] __initdata = {
- { IO_BASE , IO_START , IO_SIZE , MT_DEVICE }
+ {
+ .virtual = IO_BASE,
+ .pfn = __phys_to_pfn(IO_START),
+ .length = IO_SIZE,
+ .type = MT_DEVICE
+ }
};
static void __init shark_map_io(void)
};
static void __init shark_map_io(void)
@@
-74,17
+80,17
@@
static void __init shark_map_io(void)
#define HZ_TIME ((1193180 + HZ/2) / HZ)
static irqreturn_t
#define HZ_TIME ((1193180 + HZ/2) / HZ)
static irqreturn_t
-shark_timer_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+shark_timer_interrupt(int irq, void *dev_id)
{
write_seqlock(&xtime_lock);
{
write_seqlock(&xtime_lock);
- timer_tick(
regs
);
+ timer_tick();
write_sequnlock(&xtime_lock);
return IRQ_HANDLED;
}
static struct irqaction shark_timer_irq = {
.name = "Shark Timer Tick",
write_sequnlock(&xtime_lock);
return IRQ_HANDLED;
}
static struct irqaction shark_timer_irq = {
.name = "Shark Timer Tick",
- .flags =
SA_INTERRUPT | SA
_TIMER,
+ .flags =
IRQF_DISABLED | IRQF
_TIMER,
.handler = shark_timer_interrupt,
};
.handler = shark_timer_interrupt,
};
@@
-106,7
+112,6
@@
static struct sys_timer shark_timer = {
MACHINE_START(SHARK, "Shark")
/* Maintainer: Alexander Schulz */
MACHINE_START(SHARK, "Shark")
/* Maintainer: Alexander Schulz */
- .phys_ram = 0x08000000,
.phys_io = 0x40000000,
.io_pg_offst = ((0xe0000000) >> 18) & 0xfffc,
.boot_params = 0x08003000,
.phys_io = 0x40000000,
.io_pg_offst = ((0xe0000000) >> 18) & 0xfffc,
.boot_params = 0x08003000,