diff options
| author | Xiantao Zhang <xiantao.zhang@intel.com> | 2008-05-07 17:34:52 +0800 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-05-18 14:34:16 +0300 |
| commit | 25c437b01f3a04af5362c7fd80ba91a0ec74f007 (patch) | |
| tree | 9698337876018bd358f06ccb505aaa1fb20b2e65 /arch/ia64 | |
| parent | 021f4b6cc966d02b2bcd68841bc2f0c4897edcbb (diff) | |
| download | linux-3.10-25c437b01f3a04af5362c7fd80ba91a0ec74f007.tar.gz linux-3.10-25c437b01f3a04af5362c7fd80ba91a0ec74f007.tar.bz2 linux-3.10-25c437b01f3a04af5362c7fd80ba91a0ec74f007.zip | |
KVM: ia64: fix GVMM module including position-dependent objects
The GVMM module is position independent since it is relocated to the guest
address space.
Commit ea696f9cf ("ia64 kvm fixes for O=... builds") broke this by linking
GVMM with non-PIC objects.
Fix by creating two files: memset.S and memcpy.S which just include the files
under arch/ia64/lib/{memset.S, memcpy.S} respectively.
[akpm: don't delete files which we need]
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kvm/Makefile | 3 | ||||
| -rw-r--r-- | arch/ia64/kvm/memcpy.S | 1 | ||||
| -rw-r--r-- | arch/ia64/kvm/memset.S | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile index 52353397a1a..112791dd254 100644 --- a/arch/ia64/kvm/Makefile +++ b/arch/ia64/kvm/Makefile @@ -7,7 +7,6 @@ offsets-file := asm-offsets.h always := $(offsets-file) targets := $(offsets-file) targets += arch/ia64/kvm/asm-offsets.s -clean-files := $(addprefix $(objtree)/,$(targets) $(obj)/memcpy.S $(obj)/memset.S) # Default sed regexp - multiline due to syntax constraints define sed-y @@ -54,5 +53,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 00000000000..c04cdbe9f80 --- /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 00000000000..83c3066d844 --- /dev/null +++ b/arch/ia64/kvm/memset.S @@ -0,0 +1 @@ +#include "../lib/memset.S" |