From 3ec9341d4c43b1fd8032f7e0180a10c401bc89e5 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] --- yaml --- r: 96919 b: refs/heads/master c:
 25c437b01f3a04af5362c7fd80ba91a0ec74f007 h: refs/heads/master i:   96917:
 8d4a8142b645c6de76a3b30c4ec0d1dc350b5c78   96915:
 79b641a69c7acd489a20f1811bd8a5a4086459e6   96911:
 1dd76d8968ceb008398ab804d08076e2c273bc4b v: v3

---
 [refs]                       | 2 +-
 trunk/arch/ia64/kvm/Makefile | 3 +--
 trunk/arch/ia64/kvm/memcpy.S | 1 +
 trunk/arch/ia64/kvm/memset.S | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 trunk/arch/ia64/kvm/memcpy.S
 create mode 100644 trunk/arch/ia64/kvm/memset.S

diff --git a/[refs] b/[refs]
index 3ce556ca4d07..85dcd2fcf938 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 021f4b6cc966d02b2bcd68841bc2f0c4897edcbb
+refs/heads/master: 25c437b01f3a04af5362c7fd80ba91a0ec74f007
diff --git a/trunk/arch/ia64/kvm/Makefile b/trunk/arch/ia64/kvm/Makefile
index 52353397a1a4..112791dd2542 100644
--- a/trunk/arch/ia64/kvm/Makefile
+++ b/trunk/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/trunk/arch/ia64/kvm/memcpy.S b/trunk/arch/ia64/kvm/memcpy.S
new file mode 100644
index 000000000000..c04cdbe9f80f
--- /dev/null
+++ b/trunk/arch/ia64/kvm/memcpy.S
@@ -0,0 +1 @@
+#include "../lib/memcpy.S"
diff --git a/trunk/arch/ia64/kvm/memset.S b/trunk/arch/ia64/kvm/memset.S
new file mode 100644
index 000000000000..83c3066d844a
--- /dev/null
+++ b/trunk/arch/ia64/kvm/memset.S
@@ -0,0 +1 @@
+#include "../lib/memset.S"