ソースを参照

x86: build fix in "xen spinlock updates and performance measurements"

Ingo Molnar wrote:
> -tip testing found this build failure:
>
>  arch/x86/xen/spinlock.c: In function ‘spin_time_start’:
>  arch/x86/xen/spinlock.c:60: error: implicit declaration of function ‘xen_clocksource_read’
>
> i've excluded these new commits for now from tip/master - could you
> please send a delta fix against tip/x86/xen?

Make xen_clocksource_read non-static.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Jeremy Fitzhardinge 16 年 前
コミット
ee7686bc04
2 ファイル変更3 行追加3 行削除
  1. 1 3
      arch/x86/xen/time.c
  2. 2 0
      arch/x86/xen/xen-ops.h

+ 1 - 3
arch/x86/xen/time.c

@@ -30,8 +30,6 @@
 #define TIMER_SLOP	100000
 #define TIMER_SLOP	100000
 #define NS_PER_TICK	(1000000000LL / HZ)
 #define NS_PER_TICK	(1000000000LL / HZ)
 
 
-static cycle_t xen_clocksource_read(void);
-
 /* runstate info updated by Xen */
 /* runstate info updated by Xen */
 static DEFINE_PER_CPU(struct vcpu_runstate_info, runstate);
 static DEFINE_PER_CPU(struct vcpu_runstate_info, runstate);
 
 
@@ -213,7 +211,7 @@ unsigned long xen_tsc_khz(void)
 	return xen_khz;
 	return xen_khz;
 }
 }
 
 
-static cycle_t xen_clocksource_read(void)
+cycle_t xen_clocksource_read(void)
 {
 {
         struct pvclock_vcpu_time_info *src;
         struct pvclock_vcpu_time_info *src;
 	cycle_t ret;
 	cycle_t ret;

+ 2 - 0
arch/x86/xen/xen-ops.h

@@ -2,6 +2,7 @@
 #define XEN_OPS_H
 #define XEN_OPS_H
 
 
 #include <linux/init.h>
 #include <linux/init.h>
+#include <linux/clocksource.h>
 #include <linux/irqreturn.h>
 #include <linux/irqreturn.h>
 #include <xen/xen-ops.h>
 #include <xen/xen-ops.h>
 
 
@@ -33,6 +34,7 @@ void __init xen_build_dynamic_phys_to_machine(void);
 
 
 void xen_init_irq_ops(void);
 void xen_init_irq_ops(void);
 void xen_setup_timer(int cpu);
 void xen_setup_timer(int cpu);
+cycle_t xen_clocksource_read(void);
 void xen_setup_cpu_clockevents(void);
 void xen_setup_cpu_clockevents(void);
 unsigned long xen_tsc_khz(void);
 unsigned long xen_tsc_khz(void);
 void __init xen_time_init(void);
 void __init xen_time_init(void);