* Vincent Hanquez (vincent.hanquez@xxxxxxxxxxxx) wrote:
> Hi,
>
> sorry for the time to answer,
>
> I've put the patch here:
>
> http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/temp/xen-upgrade-2612-rc1.diff.bz2 
Last patch and this one have been working fine for me. This one spews
warnings such as:
include/asm/hw_irq.h:56:1: warning: "CALL_FUNCTION_VECTOR" redefined
In file included from include/asm-xen/asm/irq.h:16,
 from include/linux/irq.h:21,
 from include/asm/hardirq.h:6,
 from include/linux/hardirq.h:6,
 from include/linux/interrupt.h:11,
 from include/linux/netdevice.h:514,
 from include/linux/icmpv6.h:154,
 from net/compat.c:19:
include/asm-xen/asm-x86_64/mach-xen/irq_vectors.h:85:1: warning: this is the 
location of the previous definition
include/asm/hw_irq.h:53:1: warning: "INVALIDATE_TLB_VECTOR" redefined
In file included from include/asm-xen/asm/irq.h:16,
 from include/linux/irq.h:21,
 from include/asm/hardirq.h:6,
 from include/linux/hardirq.h:6,
 from include/linux/interrupt.h:11,
 from include/net/sock.h:48,
 from lib/kobject_uevent.c:24:
include/asm-xen/asm-x86_64/mach-xen/irq_vectors.h:84:1: warning: this is the 
location of the previous definition
include/asm/hw_irq.h:54:1: warning: "RESCHEDULE_VECTOR" redefined
In file included from include/asm-xen/asm/irq.h:16,
 from include/linux/irq.h:21,
 from include/asm/hardirq.h:6,
 from include/linux/hardirq.h:6,
 from include/linux/interrupt.h:11,
 from include/linux/netdevice.h:514,
 from include/net/sock.h:48,
 from lib/kobject_uevent.c:24:
include/asm-xen/asm-x86_64/mach-xen/irq_vectors.h:83:1: warning: this is the 
location of the previous definition
Also, below if rediffed portion of xen/i386/kernel/Makefile which no
longer applied due to recent changes. (untested)
--- a/linux-2.6.12-xen-sparse/arch/xen/i386/kernel/Makefile.orig 
2005年07月01日 14:14:31.000000000 -0700
+++ b/linux-2.6.12-xen-sparse/arch/xen/i386/kernel/Makefile 2005年07月01日 
14:38:16.000000000 -0700
@@ -33,6 +33,7 @@ obj-$(CONFIG_X86_MPPARSE) += mpparse.o
 obj-$(CONFIG_X86_LOCAL_APIC) += apic.o
 c-obj-$(CONFIG_X86_LOCAL_APIC) += nmi.o
 obj-$(CONFIG_X86_IO_APIC) += io_apic.o
+c-obj-$(CONFIG_X86_REBOOTFIXUPS)+= reboot_fixups.o
 c-obj-$(CONFIG_X86_NUMAQ) += numaq.o
 c-obj-$(CONFIG_X86_SUMMIT_NUMA) += summit.o
 c-obj-$(CONFIG_MODULES) += module.o
@@ -53,11 +54,11 @@ c-obj-$(CONFIG_SCx200) += scx200.o
 # Note: kbuild does not track this dependency due to usage of .incbin
 $(obj)/vsyscall.o: $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so
 targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
-targets += vsyscall.lds
+targets += vsyscall-note.o vsyscall.lds
 
 # The DSO images are built using a special linker script.
 quiet_cmd_syscall = SYSCALL $@
- cmd_syscall = $(CC) -nostdlib -m32 $(SYSCFLAGS_$(@F)) \
+ cmd_syscall = $(CC) -m elf_i386 -nostdlib $(SYSCFLAGS_$(@F)) \
 -Wl,-T,$(filter-out FORCE,$^) -o $@
 
 export CPPFLAGS_vsyscall.lds += -P -C -U$(ARCH)
@@ -67,7 +68,8 @@ SYSCFLAGS_vsyscall-sysenter.so = $(vsysc
 SYSCFLAGS_vsyscall-int80.so = $(vsyscall-flags)
 
 $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so: \
-$(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
+$(obj)/vsyscall-%.so: $(src)/vsyscall.lds \
+ $(obj)/vsyscall-%.o FORCE
 $(call if_changed,syscall)
 
 # We also create a special relocatable object that should mirror the symbol
@@ -82,13 +84,15 @@ $(obj)/vsyscall-syms.o: $(src)/vsyscall.
 $(call if_changed,syscall)
 
 c-link := init_task.o
-s-link := vsyscall-int80.o vsyscall-sysenter.o vsyscall-sigreturn.o 
vsyscall.lds.o
+s-link := vsyscall-int80.o vsyscall-sysenter.o vsyscall-sigreturn.o 
vsyscall.lds.o syscall_table.o
 
 $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-obj-m) $(c-link)) $(patsubst 
%.o,$(obj)/%.S,$(s-obj-y) $(s-link)):
 @ln -fsn $(srctree)/arch/i386/kernel/$(notdir $@) $@
 
 $(obj)/vsyscall-int80.S: $(obj)/vsyscall-sigreturn.S
 
+$(obj)/entry.o: $(src)/entry.S $(src)/syscall_table.S
+
 obj-y += $(c-obj-y) $(s-obj-y)
 obj-m += $(c-obj-m)
 
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel