direct-io.hg

changeset 4501:56971ab9b0bb

bitkeeper revision 1.1285 (4256c682Sr8bRI4v12eRFHHns2y2Jw)

x86_64 fixes.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Fri Apr 08 17:59:30 2005 +0000 (2005-04-08)
parents 608f95d3df77
children fb0fa606f610
files linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c	Fri Apr 08 17:24:38 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c	Fri Apr 08 17:59:30 2005 +0000
     1.3 @@ -86,7 +86,11 @@ struct timespec __xtime __section_xtime;
     1.4  struct timezone __sys_tz __section_sys_tz;
     1.5  #endif
     1.6  
     1.7 +#if defined(__x86_64__)
     1.8 +unsigned int cpu_khz;	/* Detected as we calibrate the TSC */
     1.9 +#else
    1.10  unsigned long cpu_khz;	/* Detected as we calibrate the TSC */
    1.11 +#endif
    1.12  
    1.13  extern unsigned long wall_jiffies;
    1.14  
     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile	Fri Apr 08 17:24:38 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile	Fri Apr 08 17:59:30 2005 +0000
     2.3 @@ -14,7 +14,7 @@ obj-y	:= process.o signal.o entry.o trap
     2.4  c-obj-y	:= semaphore.o i387.o sys_x86_64.o \
     2.5  		ptrace.o quirks.o syscall.o
     2.6  
     2.7 -obj-y				+= ../../i386/time.o
     2.8 +i386-obj-y			:= time.o
     2.9  obj-y				+= ../../i386/kernel/timers/
    2.10  
    2.11  s-obj-y	:=
    2.12 @@ -57,7 +57,10 @@ s-link	:= vsyscall.o
    2.13  $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)):
    2.14  	ln -fsn $(srctree)/arch/x86_64/kernel/$(notdir $@) $@
    2.15  
    2.16 -obj-y	+= $(c-obj-y) $(s-obj-y)
    2.17 +$(patsubst %.o,$(obj)/%.c,$(i386-obj-y)):
    2.18 +	ln -fsn $(srctree)/arch/xen/i386/kernel/$(notdir $@) $@
    2.19  
    2.20 -clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link))
    2.21 +obj-y	+= $(c-obj-y) $(s-obj-y) $(i386-obj-y)
    2.22 +
    2.23 +clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link) $(i386-obj-y))
    2.24  clean-files += $(patsubst %.o,%.S,$(s-obj-y) $(s-obj-) $(s-link))