public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 01/02] Fix build issue for IA64
@ 2008-08-15  0:51 Zhang, Xiantao
  2008-08-17  7:32 ` Avi Kivity
  0 siblings, 1 reply; 4+ messages in thread
From: Zhang, Xiantao @ 2008-08-15  0:51 UTC (permalink / raw)
  To: kvm-ia64, kvm; +Cc: Avi Kivity

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

>From 40df689b23263ffe2f2efed9950700d42f985b29 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Tue, 12 Aug 2008 08:15:10 +0800
Subject: [PATCH] KVM:Userspace: Fix build issue for IA64.

Generating asm-offset.h @ build time with host kernel.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 kernel/Makefile          |    4 ++--
 kernel/ia64/Makefile.pre |    6 +++---
 kvm.spec                 |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kernel/Makefile b/kernel/Makefile
index 0d5d148..e5f43a2 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -33,7 +33,7 @@ hack-files-ia64 =
 
 hack-files = $(hack-files-$(ARCH_DIR))
 
-all:: header-link
+all:: header-link prerequisite
 #	include header priority 1) $LINUX 2) $KERNELDIR 3)
include-compat
 	$(MAKE) -C $(KERNELDIR) M=`pwd` \
 		LINUXINCLUDE="-I`pwd`/include -Iinclude
-I`pwd`/include-compat \
@@ -41,7 +41,7 @@ all:: header-link
 		-include `pwd`/$(ARCH_DIR)/external-module-compat.h"
 		"$$@"
 
-sync: header-sync source-sync header-link prerequisite
+sync: header-sync source-sync header-link
 
 header-link:
 	rm -f include/asm
diff --git a/kernel/ia64/Makefile.pre b/kernel/ia64/Makefile.pre
index 484fe80..033bdee 100644
--- a/kernel/ia64/Makefile.pre
+++ b/kernel/ia64/Makefile.pre
@@ -1,6 +1,6 @@
 prerequisite: asm-offsets.h ia64/memset.S ia64/memcpy.S
-	cp -f $(LINUX)/arch/ia64/lib/memcpy.S ia64/memcpy.S
-	cp -f $(LINUX)/arch/ia64/lib/memset.S ia64/memset.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/
 
 asm-offsets.h: asm-offsets.s
@@ -20,4 +20,4 @@ asm-offsets.h: asm-offsets.s
 	  echo "#endif") <$< >$@
 
 asm-offsets.s: ia64/asm-offsets.c
-	gcc -S -D__KERNEL__ -I$(LINUX)/include -I./include
ia64/asm-offsets.c
+	gcc -S -D__KERNEL__ -I$(KERNELDIR)/include -I./include
ia64/asm-offsets.c
-- 
1.5.1

[-- Attachment #2: 0001-KVM-Userspace-Fix-build-issue-for-IA64.patch --]
[-- Type: application/octet-stream, Size: 1981 bytes --]

From 40df689b23263ffe2f2efed9950700d42f985b29 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Tue, 12 Aug 2008 08:15:10 +0800
Subject: [PATCH] KVM:Userspace: Fix build issue for IA64.

Generating asm-offset.h @ build time with host kernel.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 kernel/Makefile          |    4 ++--
 kernel/ia64/Makefile.pre |    6 +++---
 kvm.spec                 |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kernel/Makefile b/kernel/Makefile
index 0d5d148..e5f43a2 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -33,7 +33,7 @@ hack-files-ia64 =
 
 hack-files = $(hack-files-$(ARCH_DIR))
 
-all:: header-link
+all:: header-link prerequisite
 #	include header priority 1) $LINUX 2) $KERNELDIR 3) include-compat
 	$(MAKE) -C $(KERNELDIR) M=`pwd` \
 		LINUXINCLUDE="-I`pwd`/include -Iinclude -I`pwd`/include-compat \
@@ -41,7 +41,7 @@ all:: header-link
 		-include `pwd`/$(ARCH_DIR)/external-module-compat.h"
 		"$$@"
 
-sync: header-sync source-sync header-link prerequisite
+sync: header-sync source-sync header-link
 
 header-link:
 	rm -f include/asm
diff --git a/kernel/ia64/Makefile.pre b/kernel/ia64/Makefile.pre
index 484fe80..033bdee 100644
--- a/kernel/ia64/Makefile.pre
+++ b/kernel/ia64/Makefile.pre
@@ -1,6 +1,6 @@
 prerequisite: asm-offsets.h ia64/memset.S ia64/memcpy.S
-	cp -f $(LINUX)/arch/ia64/lib/memcpy.S ia64/memcpy.S
-	cp -f $(LINUX)/arch/ia64/lib/memset.S ia64/memset.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/
 
 asm-offsets.h: asm-offsets.s
@@ -20,4 +20,4 @@ asm-offsets.h: asm-offsets.s
 	  echo "#endif") <$< >$@
 
 asm-offsets.s: ia64/asm-offsets.c
-	gcc -S -D__KERNEL__ -I$(LINUX)/include -I./include ia64/asm-offsets.c
+	gcc -S -D__KERNEL__ -I$(KERNELDIR)/include -I./include ia64/asm-offsets.c
-- 
1.5.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 01/02] Fix build issue for IA64
  2008-08-15  0:51 [PATCH 01/02] Fix build issue for IA64 Zhang, Xiantao
@ 2008-08-17  7:32 ` Avi Kivity
  2008-08-17 10:37   ` Zhang, Xiantao
  0 siblings, 1 reply; 4+ messages in thread
From: Avi Kivity @ 2008-08-17  7:32 UTC (permalink / raw)
  To: Zhang, Xiantao; +Cc: kvm-ia64, kvm

Zhang, Xiantao wrote:
> From 40df689b23263ffe2f2efed9950700d42f985b29 Mon Sep 17 00:00:00 2001
> From: Xiantao Zhang <xiantao.zhang@intel.com>
> Date: Tue, 12 Aug 2008 08:15:10 +0800
> Subject: [PATCH] KVM:Userspace: Fix build issue for IA64.
>
> Generating asm-offset.h @ build time with host kernel.
>   

Applied, thanks.  Where's 02/02?

-- 
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.


^ permalink raw reply	[flat|nested] 4+ messages in thread

* RE: [PATCH 01/02] Fix build issue for IA64
  2008-08-17  7:32 ` Avi Kivity
@ 2008-08-17 10:37   ` Zhang, Xiantao
  2008-08-17 15:48     ` Avi Kivity
  0 siblings, 1 reply; 4+ messages in thread
From: Zhang, Xiantao @ 2008-08-17 10:37 UTC (permalink / raw)
  To: Avi Kivity; +Cc: kvm-ia64, kvm

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

Avi Kivity wrote:
> Zhang, Xiantao wrote:
>> From 40df689b23263ffe2f2efed9950700d42f985b29 Mon Sep 17 00:00:00
>> 2001 From: Xiantao Zhang <xiantao.zhang@intel.com>
>> Date: Tue, 12 Aug 2008 08:15:10 +0800
>> Subject: [PATCH] KVM:Userspace: Fix build issue for IA64.
>> 
>> Generating asm-offset.h @ build time with host kernel.
>> 
> 
> Applied, thanks.  Where's 02/02?

Oh, seems it is blocked by unknown reason.  Attached.  Thanks!
Xiantao

[-- Attachment #2: 0002-KVM-Userspace-Enable-make-user-for-ia64.patch --]
[-- Type: application/octet-stream, Size: 758 bytes --]

From 5d0733ae3f9435a785180b86bd46651b0d809cb1 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Tue, 12 Aug 2008 08:15:10 +0800
Subject: [PATCH] KVM: Userspace: Enable "make user" for ia64

Enable "make user" for ia64, although it is nothing to build.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 user/config-ia64.mak |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
 create mode 100644 user/config-ia64.mak

diff --git a/user/config-ia64.mak b/user/config-ia64.mak
new file mode 100644
index 0000000..c4c639e
--- /dev/null
+++ b/user/config-ia64.mak
@@ -0,0 +1,7 @@
+bits = 64
+CFLAGS += -m64
+CFLAGS += -D__ia64__
+CFLAGS += -I $(KERNELDIR)/include
+
+all:
+
-- 
1.5.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 01/02] Fix build issue for IA64
  2008-08-17 10:37   ` Zhang, Xiantao
@ 2008-08-17 15:48     ` Avi Kivity
  0 siblings, 0 replies; 4+ messages in thread
From: Avi Kivity @ 2008-08-17 15:48 UTC (permalink / raw)
  To: Zhang, Xiantao; +Cc: kvm-ia64, kvm

Zhang, Xiantao wrote:
> Avi Kivity wrote:
>   
>> Zhang, Xiantao wrote:
>>     
>>> From 40df689b23263ffe2f2efed9950700d42f985b29 Mon Sep 17 00:00:00
>>> 2001 From: Xiantao Zhang <xiantao.zhang@intel.com>
>>> Date: Tue, 12 Aug 2008 08:15:10 +0800
>>> Subject: [PATCH] KVM:Userspace: Fix build issue for IA64.
>>>
>>> Generating asm-offset.h @ build time with host kernel.
>>>
>>>       
>> Applied, thanks.  Where's 02/02?
>>     
>
> Oh, seems it is blocked by unknown reason.  Attached.  Thanks!

(in dos format?!)

Applied, thanks.

-- 
Do not meddle in the internals of kernels, for they are subtle and quick to panic.


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2008-08-17 15:48 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-15  0:51 [PATCH 01/02] Fix build issue for IA64 Zhang, Xiantao
2008-08-17  7:32 ` Avi Kivity
2008-08-17 10:37   ` Zhang, Xiantao
2008-08-17 15:48     ` Avi Kivity

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox