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
/
mips
/
sgi-ip27
/
ip27-timer.c
diff --git
a/arch/mips/sgi-ip27/ip27-timer.c
b/arch/mips/sgi-ip27/ip27-timer.c
index
257ce11
..
4e870fc
100644
(file)
--- a/
arch/mips/sgi-ip27/ip27-timer.c
+++ b/
arch/mips/sgi-ip27/ip27-timer.c
@@
-89,7
+89,7
@@
static int set_rtc_mmss(unsigned long nowtime)
static unsigned int rt_timer_irq;
static unsigned int rt_timer_irq;
-void ip27_rt_timer_interrupt(
struct pt_regs *regs
)
+void ip27_rt_timer_interrupt(
void
)
{
int cpu = smp_processor_id();
int cpuA = cputoslice(cpu) == 0;
{
int cpu = smp_processor_id();
int cpuA = cputoslice(cpu) == 0;
@@
-111,7
+111,7
@@
again:
if (cpu == 0)
do_timer(1);
if (cpu == 0)
do_timer(1);
- update_process_times(user_mode(
regs
));
+ update_process_times(user_mode(
get_irq_regs()
));
/*
* If we have an externally synchronized Linux clock, then update
/*
* If we have an externally synchronized Linux clock, then update