mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-30 09:36:40 +07:00
[PATCH] uml: make time data per-cpu
prev_nsecs and delta need to be arrays, and indexed by CPU number. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
c0961c1804
commit
490ba1714b
@ -35,31 +35,31 @@ unsigned long long sched_clock(void)
|
|||||||
return (unsigned long long)jiffies_64 * (1000000000 / HZ);
|
return (unsigned long long)jiffies_64 * (1000000000 / HZ);
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned long long prev_nsecs;
|
static unsigned long long prev_nsecs[NR_CPUS];
|
||||||
#ifdef CONFIG_UML_REAL_TIME_CLOCK
|
#ifdef CONFIG_UML_REAL_TIME_CLOCK
|
||||||
static long long delta; /* Deviation per interval */
|
static long long delta[NR_CPUS]; /* Deviation per interval */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void timer_irq(union uml_pt_regs *regs)
|
void timer_irq(union uml_pt_regs *regs)
|
||||||
{
|
{
|
||||||
unsigned long long ticks = 0;
|
unsigned long long ticks = 0;
|
||||||
|
|
||||||
#ifdef CONFIG_UML_REAL_TIME_CLOCK
|
#ifdef CONFIG_UML_REAL_TIME_CLOCK
|
||||||
if(prev_nsecs){
|
int c = cpu();
|
||||||
|
if(prev_nsecs[c]){
|
||||||
/* We've had 1 tick */
|
/* We've had 1 tick */
|
||||||
unsigned long long nsecs = os_nsecs();
|
unsigned long long nsecs = os_nsecs();
|
||||||
|
|
||||||
delta += nsecs - prev_nsecs;
|
delta[c] += nsecs - prev_nsecs[c];
|
||||||
prev_nsecs = nsecs;
|
prev_nsecs[c] = nsecs;
|
||||||
|
|
||||||
/* Protect against the host clock being set backwards */
|
/* Protect against the host clock being set backwards */
|
||||||
if(delta < 0)
|
if(delta[c] < 0)
|
||||||
delta = 0;
|
delta[c] = 0;
|
||||||
|
|
||||||
ticks += (delta * HZ) / BILLION;
|
ticks += (delta[c] * HZ) / BILLION;
|
||||||
delta -= (ticks * BILLION) / HZ;
|
delta[c] -= (ticks * BILLION) / HZ;
|
||||||
}
|
}
|
||||||
else prev_nsecs = os_nsecs();
|
else prev_nsecs[c] = os_nsecs();
|
||||||
#else
|
#else
|
||||||
ticks = 1;
|
ticks = 1;
|
||||||
#endif
|
#endif
|
||||||
@ -69,8 +69,8 @@ void timer_irq(union uml_pt_regs *regs)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Protects local_offset */
|
||||||
static DEFINE_SPINLOCK(timer_spinlock);
|
static DEFINE_SPINLOCK(timer_spinlock);
|
||||||
|
|
||||||
static unsigned long long local_offset = 0;
|
static unsigned long long local_offset = 0;
|
||||||
|
|
||||||
static inline unsigned long long get_time(void)
|
static inline unsigned long long get_time(void)
|
||||||
|
Loading…
Reference in New Issue
Block a user