Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
arch
/
x86
/
kernel
/
apb_timer.c
diff --git
a/kernel/arch/x86/kernel/apb_timer.c
b/kernel/arch/x86/kernel/apb_timer.c
index
6a7c23f
..
222a570
100644
(file)
--- a/
kernel/arch/x86/kernel/apb_timer.c
+++ b/
kernel/arch/x86/kernel/apb_timer.c
@@
-171,10
+171,6
@@
static int __init apbt_clockevent_register(void)
static void apbt_setup_irq(struct apbt_dev *adev)
{
static void apbt_setup_irq(struct apbt_dev *adev)
{
- /* timer0 irq has been setup early */
- if (adev->irq == 0)
- return;
-
irq_modify_status(adev->irq, 0, IRQ_MOVE_PCNTXT);
irq_set_affinity(adev->irq, cpumask_of(adev->cpu));
}
irq_modify_status(adev->irq, 0, IRQ_MOVE_PCNTXT);
irq_set_affinity(adev->irq, cpumask_of(adev->cpu));
}
@@
-267,7
+263,7
@@
static int apbt_clocksource_register(void)
/* Verify whether apbt counter works */
t1 = dw_apb_clocksource_read(clocksource_apbt);
/* Verify whether apbt counter works */
t1 = dw_apb_clocksource_read(clocksource_apbt);
-
rdtscll(start
);
+
start = rdtsc(
);
/*
* We don't know the TSC frequency yet, but waiting for
/*
* We don't know the TSC frequency yet, but waiting for
@@
-277,7
+273,7
@@
static int apbt_clocksource_register(void)
*/
do {
rep_nop();
*/
do {
rep_nop();
-
rdtscll(now
);
+
now = rdtsc(
);
} while ((now - start) < 200000UL);
/* APBT is the only always on clocksource, it has to work! */
} while ((now - start) < 200000UL);
/* APBT is the only always on clocksource, it has to work! */
@@
-394,13
+390,13
@@
unsigned long apbt_quick_calibrate(void)
old = dw_apb_clocksource_read(clocksource_apbt);
old += loop;
old = dw_apb_clocksource_read(clocksource_apbt);
old += loop;
- t1 =
__native_read_
tsc();
+ t1 =
rd
tsc();
do {
new = dw_apb_clocksource_read(clocksource_apbt);
} while (new < old);
do {
new = dw_apb_clocksource_read(clocksource_apbt);
} while (new < old);
- t2 =
__native_read_
tsc();
+ t2 =
rd
tsc();
shift = 5;
if (unlikely(loop >> shift == 0)) {
shift = 5;
if (unlikely(loop >> shift == 0)) {