summaryrefslogtreecommitdiff
path: root/src/cpu/x86
diff options
context:
space:
mode:
Diffstat (limited to 'src/cpu/x86')
-rw-r--r--src/cpu/x86/lapic/lapic_cpu_init.c2
-rw-r--r--src/cpu/x86/tsc/delay_tsc.c9
2 files changed, 6 insertions, 5 deletions
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index 75437fc6e9..d7fdd51886 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -295,7 +295,7 @@ void stop_this_cpu(void)
lapicid = lapic_read(LAPIC_ID) >> 24;
- printk_debug("CPU %d going down...\n", lapicid);
+ printk_debug("CPU %ld going down...\n", lapicid);
/* send an LAPIC INIT to myself */
lapic_write_around(LAPIC_ICR2, SET_LAPIC_DEST_FIELD(lapicid));
diff --git a/src/cpu/x86/tsc/delay_tsc.c b/src/cpu/x86/tsc/delay_tsc.c
index 92de0288a7..946d2cf512 100644
--- a/src/cpu/x86/tsc/delay_tsc.c
+++ b/src/cpu/x86/tsc/delay_tsc.c
@@ -104,6 +104,7 @@ static unsigned long long calibrate_tsc(void)
unsigned long long start, end, delta;
unsigned long result, count;
+ printk_spew("Calibrating delay loop...\n");
start = rdtscll();
// no udivdi3, dammit.
// so we count to 1<< 20 and then right shift 20
@@ -127,10 +128,10 @@ static unsigned long long calibrate_tsc(void)
delta >>= 20;
// save this for microsecond timing.
result = delta;
- printk_spew("end %x, start %x\n", end, start);
- printk_spew("32-bit delta %d\n", (unsigned long) delta);
+ printk_spew("end %llx, start %llx\n", end, start);
+ printk_spew("32-bit delta %ld\n", (unsigned long) delta);
- printk_spew("%s 32-bit result is %d\n",
+ printk_spew("%s 32-bit result is %ld\n",
__func__,
result);
return delta;
@@ -143,7 +144,7 @@ void init_timer(void)
{
if (!clocks_per_usec) {
clocks_per_usec = calibrate_tsc();
- printk_info("clocks_per_usec: %u\n", clocks_per_usec);
+ printk_info("clocks_per_usec: %lu\n", clocks_per_usec);
}
}