projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull button into test branch
[linux-drm-fsl-dcu.git]
/
arch
/
m68knommu
/
kernel
/
time.c
diff --git
a/arch/m68knommu/kernel/time.c
b/arch/m68knommu/kernel/time.c
index b17c1ecba966e103d36ad2f7108b4c28a16d2b1a..9226264abf1ab610846d9df98afa4a9c9dfca91d 100644
(file)
--- a/
arch/m68knommu/kernel/time.c
+++ b/
arch/m68knommu/kernel/time.c
@@
-10,7
+10,6
@@
* "A Kernel Model for Precision Timekeeping" by Dave Mills
*/
* "A Kernel Model for Precision Timekeeping" by Dave Mills
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/sched.h>
@@
-27,12
+26,6
@@
#define TICK_SIZE (tick_nsec / 1000)
#define TICK_SIZE (tick_nsec / 1000)
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
-extern unsigned long wall_jiffies;
-
static inline int set_rtc_mmss(unsigned long nowtime)
{
static inline int set_rtc_mmss(unsigned long nowtime)
{
@@
-56,12
+49,12
@@
static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
write_seqlock(&xtime_lock);
write_seqlock(&xtime_lock);
- do_timer(
regs
);
+ do_timer(
1
);
#ifndef CONFIG_SMP
update_process_times(user_mode(regs));
#endif
if (current->pid)
#ifndef CONFIG_SMP
update_process_times(user_mode(regs));
#endif
if (current->pid)
- profile_tick(CPU_PROFILING
, regs
);
+ profile_tick(CPU_PROFILING);
/*
* If we have an externally synchronized Linux clock, then update
/*
* If we have an externally synchronized Linux clock, then update
@@
-129,15
+122,12
@@
void time_init(void)
void do_gettimeofday(struct timeval *tv)
{
unsigned long flags;
void do_gettimeofday(struct timeval *tv)
{
unsigned long flags;
- unsigned long
lost,
seq;
+ unsigned long seq;
unsigned long usec, sec;
do {
seq = read_seqbegin_irqsave(&xtime_lock, flags);
usec = mach_gettimeoffset ? mach_gettimeoffset() : 0;
unsigned long usec, sec;
do {
seq = read_seqbegin_irqsave(&xtime_lock, flags);
usec = mach_gettimeoffset ? mach_gettimeoffset() : 0;
- lost = jiffies - wall_jiffies;
- if (lost)
- usec += lost * (1000000 / HZ);
sec = xtime.tv_sec;
usec += (xtime.tv_nsec / 1000);
} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
sec = xtime.tv_sec;
usec += (xtime.tv_nsec / 1000);
} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));