diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-03-10 18:19:16 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-03-10 18:19:16 +0000 |
| commit | a9e181eb84081724450f727cf34f7d853f83f272 (patch) | |
| tree | a5c10ea63407e633ba788ad2330f7550b8b84d0b /xenolinux-2.4.25-sparse | |
| parent | cac9a79fa84c31e2f84fad81867faf8b866d6ed4 (diff) | |
| download | xen-a9e181eb84081724450f727cf34f7d853f83f272.tar.gz xen-a9e181eb84081724450f727cf34f7d853f83f272.tar.bz2 xen-a9e181eb84081724450f727cf34f7d853f83f272.zip | |
bitkeeper revision 1.778 (404f5c24HB4-3O5d1LoEBPgmh5h6tg)
Makefile:
Create Xen interface symlink.
time.c, hypervisor-if.h, kernel.c:
Fix shared_info to make CPU TSC arch-dependent.
Diffstat (limited to 'xenolinux-2.4.25-sparse')
| -rw-r--r-- | xenolinux-2.4.25-sparse/arch/xeno/Makefile | 3 | ||||
| -rw-r--r-- | xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/Makefile index 041f2fc8cd..e9822809e7 100644 --- a/xenolinux-2.4.25-sparse/arch/xeno/Makefile +++ b/xenolinux-2.4.25-sparse/arch/xeno/Makefile @@ -111,6 +111,9 @@ archclean: @$(MAKEBOOT) clean archmrproper: + rm -f include/asm-xeno/hypervisor-ifs/arch archdep: + rm -f include/asm-xeno/hypervisor-ifs/arch + ( cd include/asm-xeno/hypervisor-ifs ; ln -sf arch-$(SUBARCH) arch) @$(MAKEBOOT) dep diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c b/xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c index 335756b050..0d41748c82 100644 --- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c +++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c @@ -211,7 +211,7 @@ static void __get_time_values_from_xen(void) rmb(); shadow_tv.tv_sec = HYPERVISOR_shared_info->wc_sec; shadow_tv.tv_usec = HYPERVISOR_shared_info->wc_usec; - shadow_tsc_stamp = HYPERVISOR_shared_info->tsc_timestamp; + shadow_tsc_stamp = HYPERVISOR_shared_info->tsc_timestamp.tsc_bits; shadow_system_time = HYPERVISOR_shared_info->system_time; rmb(); } @@ -604,7 +604,7 @@ void __init time_init(void) xtime.tv_usec = HYPERVISOR_shared_info->wc_usec; processed_system_time = shadow_system_time; - rdtsc_bitshift = HYPERVISOR_shared_info->rdtsc_bitshift; + rdtsc_bitshift = HYPERVISOR_shared_info->tsc_timestamp.tsc_bitshift; cpu_freq = HYPERVISOR_shared_info->cpu_freq; scale = 1000000LL << (32 + rdtsc_bitshift); |