← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-mvl-dove/karmic-proposed

« back to all changes in this revision

Viewing changes to arch/x86/kernel/kvmclock.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader
  • Date: 2010-03-10 22:24:12 UTC
  • mto: (15.1.2 karmic-security)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20100310222412-k86m3r53jw0je7x1
Tags: upstream-2.6.31
Import upstream version 2.6.31

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/kernel/kvmclock.c
50
50
        struct timespec ts;
51
51
        int low, high;
52
52
 
53
 
        low = (int)__pa_symbol(&wall_clock);
54
 
        high = ((u64)__pa_symbol(&wall_clock) >> 32);
 
53
        low = (int)__pa(&wall_clock);
 
54
        high = ((u64)__pa(&wall_clock) >> 32);
55
55
        native_write_msr(MSR_KVM_WALL_CLOCK, low, high);
56
56
 
57
57
        vcpu_time = &get_cpu_var(hv_clock);