summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-11-13 00:11:20 -0800
committerSimon Glass <sjg@chromium.org>2015-12-01 06:23:51 -0700
commit2f80fc50354ce9c28648a75b345a1c01d112b10f (patch)
tree29b516f20329e02cdb10502032f82d75ea4b07fc
parent0f3176ed68705ceb220c395327aee7e690f7724b (diff)
downloadu-boot-imx-2f80fc50354ce9c28648a75b345a1c01d112b10f.zip
u-boot-imx-2f80fc50354ce9c28648a75b345a1c01d112b10f.tar.gz
u-boot-imx-2f80fc50354ce9c28648a75b345a1c01d112b10f.tar.bz2
x86: tsc: Use notrace from <linux/compiler.h>
Replace __attribute__((no_instrument_function)) with notrace from <linux/compiler.h>. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/x86/lib/tsc_timer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/lib/tsc_timer.c b/arch/x86/lib/tsc_timer.c
index e02b918..5a962ce 100644
--- a/arch/x86/lib/tsc_timer.c
+++ b/arch/x86/lib/tsc_timer.c
@@ -288,7 +288,7 @@ void timer_set_base(u64 base)
* restart. This yields a free running counter guaranteed to take almost 6
* years to wrap around even at 100GHz clock rate.
*/
-u64 __attribute__((no_instrument_function)) get_ticks(void)
+u64 notrace get_ticks(void)
{
u64 now_tick = rdtsc();
@@ -299,7 +299,7 @@ u64 __attribute__((no_instrument_function)) get_ticks(void)
}
/* Get the speed of the TSC timer in MHz */
-unsigned __attribute__((no_instrument_function)) long get_tbclk_mhz(void)
+unsigned notrace long get_tbclk_mhz(void)
{
unsigned long fast_calibrate;
@@ -337,7 +337,7 @@ ulong get_timer(ulong base)
return get_ms_timer() - base;
}
-ulong __attribute__((no_instrument_function)) timer_get_us(void)
+ulong notrace timer_get_us(void)
{
return get_ticks() / get_tbclk_mhz();
}