Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee7686bc authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

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: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f8eca41f

arch/x86/xen/time.c

+1 −3
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#define TIMER_SLOP	100000

#define NS_PER_TICK	(1000000000LL / HZ)



static cycle_t xen_clocksource_read(void);



/* runstate info updated by Xen */

static DEFINE_PER_CPU(struct vcpu_runstate_info, runstate);
@@ -213,7 +211,7 @@ unsigned long xen_tsc_khz(void) 
	return xen_khz;

}



static cycle_t xen_clocksource_read(void)

cycle_t xen_clocksource_read(void)

{

        struct pvclock_vcpu_time_info *src;

	cycle_t ret;

arch/x86/xen/xen-ops.h

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define XEN_OPS_H



#include <linux/init.h>

#include <linux/clocksource.h>

#include <linux/irqreturn.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_setup_timer(int cpu);

cycle_t xen_clocksource_read(void);

void xen_setup_cpu_clockevents(void);

unsigned long xen_tsc_khz(void);

void __init xen_time_init(void);