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-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
time.c
diff --git
a/arch/sparc/kernel/time.c
b/arch/sparc/kernel/time.c
index
e10dc83
..
6c7aa51
100644
(file)
--- a/
arch/sparc/kernel/time.c
+++ b/
arch/sparc/kernel/time.c
@@
-42,6
+42,7
@@
#include <asm/page.h>
#include <asm/pcic.h>
#include <asm/of_device.h>
#include <asm/page.h>
#include <asm/pcic.h>
#include <asm/of_device.h>
+#include <asm/irq_regs.h>
DEFINE_SPINLOCK(rtc_lock);
enum sparc_clock_type sp_clock_typ;
DEFINE_SPINLOCK(rtc_lock);
enum sparc_clock_type sp_clock_typ;
@@
-94,6
+95,8
@@
unsigned long profile_pc(struct pt_regs *regs)
return pc;
}
return pc;
}
+EXPORT_SYMBOL(profile_pc);
+
__volatile__ unsigned int *master_l10_counter;
__volatile__ unsigned int *master_l10_limit;
__volatile__ unsigned int *master_l10_counter;
__volatile__ unsigned int *master_l10_limit;
@@
-104,13
+107,13
@@
__volatile__ unsigned int *master_l10_limit;
#define TICK_SIZE (tick_nsec / 1000)
#define TICK_SIZE (tick_nsec / 1000)
-irqreturn_t timer_interrupt(int irq, void *dev_id
, struct pt_regs * regs
)
+irqreturn_t timer_interrupt(int irq, void *dev_id)
{
/* last time the cmos clock got updated */
static long last_rtc_update;
#ifndef CONFIG_SMP
{
/* last time the cmos clock got updated */
static long last_rtc_update;
#ifndef CONFIG_SMP
- profile_tick(CPU_PROFILING
, regs
);
+ profile_tick(CPU_PROFILING);
#endif
/* Protect counter clear so that do_gettimeoffset works */
#endif
/* Protect counter clear so that do_gettimeoffset works */
@@
-128,7
+131,7
@@
irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs * regs)
do_timer(1);
#ifndef CONFIG_SMP
do_timer(1);
#ifndef CONFIG_SMP
- update_process_times(user_mode(
regs
));
+ update_process_times(user_mode(
get_irq_regs()
));
#endif
#endif