>From b0c2d5e90957341b6f1e13bc80d2bc77e9aa01be Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
Date: Sat, 6 Sep 2008 10:51:37 +0800
Subject: [PATCH] kvm/ia64: external module: Add printk support for
kvm-intel.
Signed-off-by: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
---
kernel/Makefile | 2 +-
kernel/ia64/Kbuild | 2 +-
kernel/ia64/Makefile.pre | 4 ++++
kernel/ia64/hack-module.awk | 4 ++++
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/kernel/Makefile b/kernel/Makefile
index 3f5f6da..44087e4 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -29,7 +29,7 @@ unifdef = mv $1 $1.orig && \
hack = $(call _hack,$T/$(strip $1))
hack-files-x86 = kvm_main.c mmu.c vmx.c svm.c x86.c irq.h lapic.c
i8254.c
-hack-files-ia64 = kvm_main.c kvm_fw.c
+hack-files-ia64 = kvm_main.c kvm_fw.c kvm_lib.c
hack-files = $(hack-files-$(ARCH_DIR))
diff --git a/kernel/ia64/Kbuild b/kernel/ia64/Kbuild
index 8561476..1f2e689 100644
--- a/kernel/ia64/Kbuild
+++ b/kernel/ia64/Kbuild
@@ -5,4 +5,4 @@ kvm-objs := kvm_main.o ioapic.o coalesced_mmio.o
kvm-ia64.o kvm_fw.o \
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 memset.o memcpy.o
+ vtlb.o process.o memset.o memcpy.o kvm_lib.o
diff --git a/kernel/ia64/Makefile.pre b/kernel/ia64/Makefile.pre
index c55ea0f..80f9c3f 100644
--- a/kernel/ia64/Makefile.pre
+++ b/kernel/ia64/Makefile.pre
@@ -1,6 +1,10 @@
prerequisite: asm-offsets.h ia64/memset.S ia64/memcpy.S
cp -f $(KERNELDIR)/arch/ia64/lib/memcpy.S ia64/memcpy.S
cp -f $(KERNELDIR)/arch/ia64/lib/memset.S ia64/memset.S
+ cp -f $(KERNELDIR)/lib/vsprintf.c ia64/vsprintf.c
+ cp -f $(KERNELDIR)/lib/ctype.c ia64/ctype.c
+ sed -i /^EXPORT_SYMBOL/d ia64/vsprintf.c
+ sed -i /^EXPORT_SYMBOL/d ia64/ctype.c
cmp -s asm-offset.h ia64/asm-offset.h || mv -f asm-offsets.*
ia64/
asm-offsets.h: asm-offsets.s
diff --git a/kernel/ia64/hack-module.awk b/kernel/ia64/hack-module.awk
index b9b24c0..07912c5 100644
--- a/kernel/ia64/hack-module.awk
+++ b/kernel/ia64/hack-module.awk
@@ -4,6 +4,10 @@ BEGIN { split("INIT_WORK on_each_cpu smp_call_function"
, compat_apis); }
printf("MODULE_INFO(version, \"%s\");\n", version)
}
+{ sub(/..\/..\/..\/lib\/vsprintf\.c/, "vsprintf.c") }
+{ sub(/..\/..\/..\/lib\/ctype\.c/, "ctype.c") }
+/#undef CONFIG_MODULES/ { $0 = "" }
+
{
for (i in compat_apis) {
ident = compat_apis[i]
--
1.5.1
Attachment:
0001-kvm-ia64-external-module-Add-printk-support-for-kv.patch
Description: 0001-kvm-ia64-external-module-Add-printk-support-for-kv.patch
