[PATCH] GVMM module shouldn't link the position-dependent objects

[PATCH] GVMM module shouldn't link the position-dependent objects

[Zhang, Xiantao]

[-- Attachment #1: Type: text/plain, Size: 1649 bytes --]

Critical fix for kvm/ia64 build. Issue introduced by
ea696f9cf37d8ab9236dd133ddb2727264f3add6. 

From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Wed, 7 May 2008 17:34:52 +0800
Subject: [PATCH] KVM: kvm/ia-64: GVMM module shouldn't link the
position-dependent objects.

Create two files: memset.S and memcpy.S which just includes the files
under arch/ia64/lib/{memset.S, memcpy.S} respectively.

Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 arch/ia64/kvm/Makefile |    2 +-
 arch/ia64/kvm/memcpy.S |    1 +
 arch/ia64/kvm/memset.S |    1 +
 3 files changed, 3 insertions(+), 1 deletions(-)
 create mode 100644 arch/ia64/kvm/memcpy.S
 create mode 100644 arch/ia64/kvm/memset.S

diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index 5235339..d60c5c8 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -54,5 +54,5 @@ EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
 kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o
\
 	vtlb.o process.o
 #Add link memcpy and memset to avoid possible structure assignment
error
-kvm-intel-objs += ../lib/memset.o ../lib/memcpy.o
+kvm-intel-objs += memcpy.o memset.o
 obj-$(CONFIG_KVM_INTEL) += kvm-intel.o
diff --git a/arch/ia64/kvm/memcpy.S b/arch/ia64/kvm/memcpy.S
new file mode 100644
index 0000000..c04cdbe
--- /dev/null
+++ b/arch/ia64/kvm/memcpy.S
@@ -0,0 +1 @@
+#include "../lib/memcpy.S"
diff --git a/arch/ia64/kvm/memset.S b/arch/ia64/kvm/memset.S
new file mode 100644
index 0000000..83c3066
--- /dev/null
+++ b/arch/ia64/kvm/memset.S
@@ -0,0 +1 @@
+#include "../lib/memset.S"
-- 
1.5.2

[-- Attachment #2: 0001-KVM-kvm-ia-64-GVMM-module-shouldn-t-link-the-posit.patch --]
[-- Type: application/octet-stream, Size: 1575 bytes --]

From b0887498cf66049acbdadb2e0bfacec429e2057f Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Wed, 7 May 2008 17:34:52 +0800
Subject: [PATCH] KVM: kvm/ia-64: GVMM module shouldn't link the position-dependent objects.

Create two files: memset.S and memcpy.S which just includes the files
under arch/ia64/lib/{memset.S, memcpy.S} respectively.

Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 arch/ia64/kvm/Makefile |    2 +-
 arch/ia64/kvm/memcpy.S |    1 +
 arch/ia64/kvm/memset.S |    1 +
 3 files changed, 3 insertions(+), 1 deletions(-)
 create mode 100644 arch/ia64/kvm/memcpy.S
 create mode 100644 arch/ia64/kvm/memset.S

diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index 5235339..d60c5c8 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -54,5 +54,5 @@ EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
 kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \
 	vtlb.o process.o
 #Add link memcpy and memset to avoid possible structure assignment error
-kvm-intel-objs += ../lib/memset.o ../lib/memcpy.o
+kvm-intel-objs += memcpy.o memset.o
 obj-$(CONFIG_KVM_INTEL) += kvm-intel.o
diff --git a/arch/ia64/kvm/memcpy.S b/arch/ia64/kvm/memcpy.S
new file mode 100644
index 0000000..c04cdbe
--- /dev/null
+++ b/arch/ia64/kvm/memcpy.S
@@ -0,0 +1 @@
+#include "../lib/memcpy.S"
diff --git a/arch/ia64/kvm/memset.S b/arch/ia64/kvm/memset.S
new file mode 100644
index 0000000..83c3066
--- /dev/null
+++ b/arch/ia64/kvm/memset.S
@@ -0,0 +1 @@
+#include "../lib/memset.S"
-- 
1.5.2


[-- Attachment #3: Type: text/plain, Size: 320 bytes --]

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone

[-- Attachment #4: Type: text/plain, Size: 158 bytes --]

_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel

Re: [PATCH] GVMM module shouldn't link the position-dependent objects

[Avi Kivity]

Zhang, Xiantao wrote:
> Critical fix for kvm/ia64 build. Issue introduced by
> ea696f9cf37d8ab9236dd133ddb2727264f3add6. 
>
> From: Xiantao Zhang <xiantao.zhang@intel.com>
> Date: Wed, 7 May 2008 17:34:52 +0800
> Subject: [PATCH] KVM: kvm/ia-64: GVMM module shouldn't link the
> position-dependent objects.
>
> Create two files: memset.S and memcpy.S which just includes the files
> under arch/ia64/lib/{memset.S, memcpy.S} respectively.
>
>   

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone