Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 113249
b: refs/heads/master
c: ee7686b
h: refs/heads/master
i:
  113247: 7c8abf0
v: v3
  • Loading branch information
Jeremy Fitzhardinge authored and Ingo Molnar committed Aug 22, 2008
1 parent 8ea5dfc commit 7c12cf5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f8eca41f0afcc7042dc3398c8ba5878c59b1cf1b
refs/heads/master: ee7686bc043921a488d9bf89fe93241c5457a74e
4 changes: 1 addition & 3 deletions trunk/arch/x86/xen/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/x86/xen/xen-ops.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 7c12cf5

Please sign in to comment.