From 91682c7cacbec34a8cddb92b1dbc1deeed39b633 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Mon, 17 Aug 2015 12:59:39 +0200 Subject: [PATCH] some code cleanups --- hermit/arch/x86/kernel/processor.c | 2 +- hermit/arch/x86/kernel/timer.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hermit/arch/x86/kernel/processor.c b/hermit/arch/x86/kernel/processor.c index 09da48374..b0dcd55f4 100644 --- a/hermit/arch/x86/kernel/processor.c +++ b/hermit/arch/x86/kernel/processor.c @@ -419,7 +419,7 @@ uint32_t get_cpu_frequency(void) void udelay(uint32_t usecs) { - if (BUILTIN_EXPECT(has_rdtscp(), 1)) { + if (has_rdtscp()) { uint64_t diff, end, start = rdtscp(NULL); uint64_t deadline = get_cpu_frequency() * usecs; diff --git a/hermit/arch/x86/kernel/timer.c b/hermit/arch/x86/kernel/timer.c index c674dcb40..b9bc27ddf 100644 --- a/hermit/arch/x86/kernel/timer.c +++ b/hermit/arch/x86/kernel/timer.c @@ -49,7 +49,7 @@ static uint64_t last_rdtsc = 0; void start_tickless(void) { use_tickless = 1; - if (BUILTIN_EXPECT(has_rdtscp(), 1)) + if (has_rdtscp()) last_rdtsc = rdtscp(NULL); else last_rdtsc = rdtsc(); @@ -71,7 +71,7 @@ void check_ticks(void) if (CORE_ID == boot_processor) #endif { - if (BUILTIN_EXPECT(has_rdtscp(), 1)){ + if (has_rdtscp()){ uint64_t curr_rdtsc = rdtscp(NULL); uint64_t diff; @@ -158,7 +158,7 @@ int timer_wait(unsigned int ticks) } #define LATCH(f) ((CLOCK_TICK_RATE + f/2) / f) -#define WAIT_SOME_TIME() do { uint64_t start = rdtsc(); \ +#define WAIT_SOME_TIME() do { uint64_t start = rdtsc(); mb(); \ while(rdtsc() - start < 1000000) ; \ } while (0)