Subject: linux-next: build failure after merge of the char-misc tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 7 Aug 2015 16:32:14 +1000

Hi all,

After merging the char-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/hv/hv.c: In function 'read_hv_clock_tsc':
drivers/hv/hv.c:154:4: error: implicit declaration of function 'rdtscll' [-Werror=implicit-function-declaration]
    rdtscll(cur_tsc);
    ^

Caused by commit

  ca9357bd26c2 ("Drivers: hv: vmbus: Implement a clocksource based on the TSC page")

interacting with commits

  87be28aaf145 ("x86/asm/tsc: Replace rdtscll() with native_read_tsc()")
  4ea1636b04db ("x86/asm/tsc: Rename native_read_tsc() to rdtsc()")

from the tip tree.

Please consider maintaining API's for a release cycle when changing them.

I have applied the following merge fix patch:

From: Stephen Rothwell <[email-masked]>
Date: Fri, 7 Aug 2015 16:21:32 +1000
Subject: [PATCH] Drivers: hv: vmbus: fix for the removal of rdtscll()

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 drivers/hv/hv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 6341be8739ae..335064f01c37 100644
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -151,7 +151,7 @@ static cycle_t read_hv_clock_tsc(struct clocksource *arg)
 			u64 scale = tsc_pg->tsc_scale;
 			s64 offset = tsc_pg->tsc_offset;
 
-			rdtscll(cur_tsc);
+			cur_tsc = rdtsc();
 			/* current_tick = ((cur_tsc *scale) >> 64) + offset */
 			asm("mulq %3"
 				: "=d" (current_tick), "=a" (tmp)
-- 
2.5.0

-- 
Cheers,
Stephen Rothwell                    [email-masked]