[Xen-changelog] x86_64 fixes.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1285, 2005/04/08 18:59:30+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        x86_64 fixes.
        Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>



 i386/kernel/time.c     |    4 ++++
 x86_64/kernel/Makefile |    9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c 
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c       2005-04-10 
23:03:41 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c       2005-04-10 
23:03:41 -04:00
@@ -86,7 +86,11 @@
 struct timezone __sys_tz __section_sys_tz;
 #endif
 
+#if defined(__x86_64__)
+unsigned int cpu_khz;  /* Detected as we calibrate the TSC */
+#else
 unsigned long cpu_khz; /* Detected as we calibrate the TSC */
+#endif
 
 extern unsigned long wall_jiffies;
 
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile 
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile
--- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile   2005-04-10 
23:03:41 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile   2005-04-10 
23:03:41 -04:00
@@ -14,7 +14,7 @@
 c-obj-y        := semaphore.o i387.o sys_x86_64.o \
                ptrace.o quirks.o syscall.o
 
-obj-y                          += ../../i386/time.o
+i386-obj-y                     := time.o
 obj-y                          += ../../i386/kernel/timers/
 
 s-obj-y        :=
@@ -57,7 +57,10 @@
 $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)) $(patsubst 
%.o,$(obj)/%.S,$(s-obj-y) $(s-link)):
        ln -fsn $(srctree)/arch/x86_64/kernel/$(notdir $@) $@
 
-obj-y  += $(c-obj-y) $(s-obj-y)
+$(patsubst %.o,$(obj)/%.c,$(i386-obj-y)):
+       ln -fsn $(srctree)/arch/xen/i386/kernel/$(notdir $@) $@
 
-clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link))
+obj-y  += $(c-obj-y) $(s-obj-y) $(i386-obj-y)
+
+clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link) $(i386-obj-y))
 clean-files += $(patsubst %.o,%.S,$(s-obj-y) $(s-obj-) $(s-link))

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog