* [PATCH][3/3] kvm/ia64: external module: Add printk support for kvm-intel.
@ 2008-09-06 4:03 ` Zhang, Xiantao
0 siblings, 0 replies; 6+ messages in thread
From: Zhang, Xiantao @ 2008-09-06 4:03 UTC (permalink / raw)
To: kvm-ia64
[-- Attachment #1: Type: text/plain, Size: 2614 bytes --]
From b0c2d5e90957341b6f1e13bc80d2bc77e9aa01be Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
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@intel.com>
---
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 #2: 0001-kvm-ia64-external-module-Add-printk-support-for-kv.patch --]
[-- Type: application/octet-stream, Size: 2542 bytes --]
From b0c2d5e90957341b6f1e13bc80d2bc77e9aa01be Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
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@intel.com>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH][3/3] kvm/ia64: external module: Add printk support for kvm-intel.
@ 2008-09-06 4:03 ` Zhang, Xiantao
0 siblings, 0 replies; 6+ messages in thread
From: Zhang, Xiantao @ 2008-09-06 4:03 UTC (permalink / raw)
To: kvm-ia64; +Cc: kvm, Avi Kivity
[-- Attachment #1: Type: text/plain, Size: 2615 bytes --]
>From b0c2d5e90957341b6f1e13bc80d2bc77e9aa01be Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
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@intel.com>
---
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 #2: 0001-kvm-ia64-external-module-Add-printk-support-for-kv.patch --]
[-- Type: application/octet-stream, Size: 2542 bytes --]
From b0c2d5e90957341b6f1e13bc80d2bc77e9aa01be Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
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@intel.com>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH][3/3] kvm/ia64: external module: Add printk support for
@ 2008-11-27 9:44 ` Zhang, Xiantao
0 siblings, 0 replies; 6+ messages in thread
From: Zhang, Xiantao @ 2008-11-27 9:44 UTC (permalink / raw)
To: kvm-ia64
[-- Attachment #1: Type: text/plain, Size: 2940 bytes --]
Please drop the previous one.
Xiantao
From c86bee60542097fd2064cb4ae4e0d6a555b1e688 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 27 Nov 2008 17:39:13 +0800
Subject: [PATCH] KVM: external module: Fix for printk support.
kvm-intel module added printk support in kernel, this patch
fix build failure with it.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
kernel/Makefile | 2 +-
kernel/ia64/Kbuild | 2 +-
kernel/ia64/Makefile.pre | 4 ++++
kernel/ia64/hack-module.awk | 8 ++++++++
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/kernel/Makefile b/kernel/Makefile
index eaf1c8e..41449d6 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -30,7 +30,7 @@ unifdef = mv $1 $1.orig && cat unifdef.h $1.orig > $1 && rm $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 kvm_trace.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 88eaa39..130ec45 100644
--- a/kernel/ia64/Kbuild
+++ b/kernel/ia64/Kbuild
@@ -9,4 +9,4 @@ endif
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 fa8cefd..4d3410f 100644
--- a/kernel/ia64/Makefile.pre
+++ b/kernel/ia64/Makefile.pre
@@ -2,6 +2,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
cmp -s asm-offset.h ia64/asm-offset.h || mv -f asm-offsets.* ia64/
+ 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
asm-offsets.h: asm-offsets.s
@(set -e; \
diff --git a/kernel/ia64/hack-module.awk b/kernel/ia64/hack-module.awk
index 38db00f..3dd2260 100644
--- a/kernel/ia64/hack-module.awk
+++ b/kernel/ia64/hack-module.awk
@@ -5,6 +5,10 @@ BEGIN { split("INIT_WORK on_each_cpu smp_call_function " \
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]
@@ -14,4 +18,8 @@ BEGIN { split("INIT_WORK on_each_cpu smp_call_function " \
/#include <linux\/compiler.h>/ { $0 = "" }
+{ sub(/linux\/mm_types\.h/, "linux/mm.h") }
+
+{ sub(/\<__user\>/, " ") }
+
{ print }
--
1.6.0
[-- Attachment #2: 0003-KVM-external-module-Fix-for-printk-support.patch --]
[-- Type: application/octet-stream, Size: 2818 bytes --]
From c86bee60542097fd2064cb4ae4e0d6a555b1e688 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 27 Nov 2008 17:39:13 +0800
Subject: [PATCH] KVM: external module: Fix for printk support.
kvm-intel module added printk support in kernel, this patch
fix build failure with it.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
kernel/Makefile | 2 +-
kernel/ia64/Kbuild | 2 +-
kernel/ia64/Makefile.pre | 4 ++++
kernel/ia64/hack-module.awk | 8 ++++++++
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/kernel/Makefile b/kernel/Makefile
index eaf1c8e..41449d6 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -30,7 +30,7 @@ unifdef = mv $1 $1.orig && cat unifdef.h $1.orig > $1 && rm $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 kvm_trace.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 88eaa39..130ec45 100644
--- a/kernel/ia64/Kbuild
+++ b/kernel/ia64/Kbuild
@@ -9,4 +9,4 @@ endif
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 fa8cefd..4d3410f 100644
--- a/kernel/ia64/Makefile.pre
+++ b/kernel/ia64/Makefile.pre
@@ -2,6 +2,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
cmp -s asm-offset.h ia64/asm-offset.h || mv -f asm-offsets.* ia64/
+ 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
asm-offsets.h: asm-offsets.s
@(set -e; \
diff --git a/kernel/ia64/hack-module.awk b/kernel/ia64/hack-module.awk
index 38db00f..3dd2260 100644
--- a/kernel/ia64/hack-module.awk
+++ b/kernel/ia64/hack-module.awk
@@ -5,6 +5,10 @@ BEGIN { split("INIT_WORK on_each_cpu smp_call_function " \
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]
@@ -14,4 +18,8 @@ BEGIN { split("INIT_WORK on_each_cpu smp_call_function " \
/#include <linux\/compiler.h>/ { $0 = "" }
+{ sub(/linux\/mm_types\.h/, "linux/mm.h") }
+
+{ sub(/\<__user\>/, " ") }
+
{ print }
--
1.6.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH][3/3] kvm/ia64: external module: Add printk support for kvm-intel.
@ 2008-11-27 9:44 ` Zhang, Xiantao
0 siblings, 0 replies; 6+ messages in thread
From: Zhang, Xiantao @ 2008-11-27 9:44 UTC (permalink / raw)
To: Zhang, Xiantao, kvm-ia64@vger.kernel.org; +Cc: kvm@vger.kernel.org, Avi Kivity
[-- Attachment #1: Type: text/plain, Size: 2941 bytes --]
Please drop the previous one.
Xiantao
>From c86bee60542097fd2064cb4ae4e0d6a555b1e688 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 27 Nov 2008 17:39:13 +0800
Subject: [PATCH] KVM: external module: Fix for printk support.
kvm-intel module added printk support in kernel, this patch
fix build failure with it.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
kernel/Makefile | 2 +-
kernel/ia64/Kbuild | 2 +-
kernel/ia64/Makefile.pre | 4 ++++
kernel/ia64/hack-module.awk | 8 ++++++++
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/kernel/Makefile b/kernel/Makefile
index eaf1c8e..41449d6 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -30,7 +30,7 @@ unifdef = mv $1 $1.orig && cat unifdef.h $1.orig > $1 && rm $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 kvm_trace.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 88eaa39..130ec45 100644
--- a/kernel/ia64/Kbuild
+++ b/kernel/ia64/Kbuild
@@ -9,4 +9,4 @@ endif
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 fa8cefd..4d3410f 100644
--- a/kernel/ia64/Makefile.pre
+++ b/kernel/ia64/Makefile.pre
@@ -2,6 +2,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
cmp -s asm-offset.h ia64/asm-offset.h || mv -f asm-offsets.* ia64/
+ 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
asm-offsets.h: asm-offsets.s
@(set -e; \
diff --git a/kernel/ia64/hack-module.awk b/kernel/ia64/hack-module.awk
index 38db00f..3dd2260 100644
--- a/kernel/ia64/hack-module.awk
+++ b/kernel/ia64/hack-module.awk
@@ -5,6 +5,10 @@ BEGIN { split("INIT_WORK on_each_cpu smp_call_function " \
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]
@@ -14,4 +18,8 @@ BEGIN { split("INIT_WORK on_each_cpu smp_call_function " \
/#include <linux\/compiler.h>/ { $0 = "" }
+{ sub(/linux\/mm_types\.h/, "linux/mm.h") }
+
+{ sub(/\<__user\>/, " ") }
+
{ print }
--
1.6.0
[-- Attachment #2: 0003-KVM-external-module-Fix-for-printk-support.patch --]
[-- Type: application/octet-stream, Size: 2818 bytes --]
From c86bee60542097fd2064cb4ae4e0d6a555b1e688 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 27 Nov 2008 17:39:13 +0800
Subject: [PATCH] KVM: external module: Fix for printk support.
kvm-intel module added printk support in kernel, this patch
fix build failure with it.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
kernel/Makefile | 2 +-
kernel/ia64/Kbuild | 2 +-
kernel/ia64/Makefile.pre | 4 ++++
kernel/ia64/hack-module.awk | 8 ++++++++
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/kernel/Makefile b/kernel/Makefile
index eaf1c8e..41449d6 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -30,7 +30,7 @@ unifdef = mv $1 $1.orig && cat unifdef.h $1.orig > $1 && rm $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 kvm_trace.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 88eaa39..130ec45 100644
--- a/kernel/ia64/Kbuild
+++ b/kernel/ia64/Kbuild
@@ -9,4 +9,4 @@ endif
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 fa8cefd..4d3410f 100644
--- a/kernel/ia64/Makefile.pre
+++ b/kernel/ia64/Makefile.pre
@@ -2,6 +2,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
cmp -s asm-offset.h ia64/asm-offset.h || mv -f asm-offsets.* ia64/
+ 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
asm-offsets.h: asm-offsets.s
@(set -e; \
diff --git a/kernel/ia64/hack-module.awk b/kernel/ia64/hack-module.awk
index 38db00f..3dd2260 100644
--- a/kernel/ia64/hack-module.awk
+++ b/kernel/ia64/hack-module.awk
@@ -5,6 +5,10 @@ BEGIN { split("INIT_WORK on_each_cpu smp_call_function " \
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]
@@ -14,4 +18,8 @@ BEGIN { split("INIT_WORK on_each_cpu smp_call_function " \
/#include <linux\/compiler.h>/ { $0 = "" }
+{ sub(/linux\/mm_types\.h/, "linux/mm.h") }
+
+{ sub(/\<__user\>/, " ") }
+
{ print }
--
1.6.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH][3/3] kvm/ia64: external module: Add printk support for
2008-11-27 9:44 ` [PATCH][3/3] kvm/ia64: external module: Add printk support for kvm-intel Zhang, Xiantao
@ 2008-11-30 10:33 ` Avi Kivity
-1 siblings, 0 replies; 6+ messages in thread
From: Avi Kivity @ 2008-11-30 10:33 UTC (permalink / raw)
To: kvm-ia64
Zhang, Xiantao wrote:
> Please drop the previous one.
> Xiantao
>
Thanks, all three patches applied.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][3/3] kvm/ia64: external module: Add printk support for kvm-intel.
@ 2008-11-30 10:33 ` Avi Kivity
0 siblings, 0 replies; 6+ messages in thread
From: Avi Kivity @ 2008-11-30 10:33 UTC (permalink / raw)
To: Zhang, Xiantao; +Cc: kvm-ia64@vger.kernel.org, kvm@vger.kernel.org, Avi Kivity
Zhang, Xiantao wrote:
> Please drop the previous one.
> Xiantao
>
Thanks, all three patches applied.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-11-30 10:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-06 4:03 [PATCH][3/3] kvm/ia64: external module: Add printk support for kvm-intel Zhang, Xiantao
2008-09-06 4:03 ` Zhang, Xiantao
2008-11-27 9:44 ` [PATCH][3/3] kvm/ia64: external module: Add printk support for Zhang, Xiantao
2008-11-27 9:44 ` [PATCH][3/3] kvm/ia64: external module: Add printk support for kvm-intel Zhang, Xiantao
2008-11-30 10:33 ` [PATCH][3/3] kvm/ia64: external module: Add printk support for Avi Kivity
2008-11-30 10:33 ` [PATCH][3/3] kvm/ia64: external module: Add printk support for kvm-intel Avi Kivity
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.