* [PATCH] Fix linux compilation on x86-64
@ 2007-01-20 17:22 Stefan Berger
2007-01-21 6:57 ` Muli Ben-Yehuda
2007-01-21 15:30 ` Keir Fraser
0 siblings, 2 replies; 6+ messages in thread
From: Stefan Berger @ 2007-01-20 17:22 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1: Type: text/plain, Size: 129 bytes --]
This patch fixes Linux 2.6.18 compilation on x86-64 and also works on
i386.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
[-- Attachment #2: swiotlb_force_x86-64-fix.diff --]
[-- Type: text/x-patch, Size: 486 bytes --]
Index: root/xen-unstable.hg/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c
===================================================================
--- root.orig/xen-unstable.hg/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c
+++ root/xen-unstable.hg/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c
@@ -47,7 +47,7 @@ EXPORT_SYMBOL(swiotlb);
*/
#define IO_TLB_SHIFT 11
-static int swiotlb_force;
+int swiotlb_force;
static char *iotlb_virt_start;
static unsigned long iotlb_nslabs;
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix linux compilation on x86-64
2007-01-20 17:22 [PATCH] Fix linux compilation on x86-64 Stefan Berger
@ 2007-01-21 6:57 ` Muli Ben-Yehuda
2007-01-21 15:30 ` Keir Fraser
1 sibling, 0 replies; 6+ messages in thread
From: Muli Ben-Yehuda @ 2007-01-21 6:57 UTC (permalink / raw)
To: Stefan Berger; +Cc: xen-devel
On Sat, Jan 20, 2007 at 12:22:15PM -0500, Stefan Berger wrote:
> This patch fixes Linux 2.6.18 compilation on x86-64 and also works on
> i386.
>
> Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Cheers,
Muli
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix linux compilation on x86-64
2007-01-20 17:22 [PATCH] Fix linux compilation on x86-64 Stefan Berger
2007-01-21 6:57 ` Muli Ben-Yehuda
@ 2007-01-21 15:30 ` Keir Fraser
2007-01-21 16:25 ` Stefan Berger
` (2 more replies)
1 sibling, 3 replies; 6+ messages in thread
From: Keir Fraser @ 2007-01-21 15:30 UTC (permalink / raw)
To: Stefan Berger, xen-devel
I don't see swiotlb_force used outside of swiotlb.c. How is the build broken
(it works for me)?
-- Keir
On 20/1/07 5:22 pm, "Stefan Berger" <stefanb@us.ibm.com> wrote:
> This patch fixes Linux 2.6.18 compilation on x86-64 and also works on
> i386.
>
> Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix linux compilation on x86-64
2007-01-21 15:30 ` Keir Fraser
@ 2007-01-21 16:25 ` Stefan Berger
2007-01-21 18:06 ` Stephan Seitz
2007-01-22 14:42 ` B Thomas
2 siblings, 0 replies; 6+ messages in thread
From: Stefan Berger @ 2007-01-21 16:25 UTC (permalink / raw)
To: Keir Fraser; +Cc: xen-devel
[-- Attachment #1.1: Type: text/plain, Size: 2238 bytes --]
This is what I get:
INSTALL sound/usb/usx2y/snd-usb-usx2y.ko
if [ -r System.map -a -x /sbin/depmod ]; then /sbin/depmod -ae -F
System.map -b / -r 2.6.18-xen; fi
WARNING: //lib/modules/2.6.18-xen/kernel/drivers/char/drm/drm.ko needs
unknown symbol init_level4_pgt
make[3]: Leaving directory
`/root/xen-unstable.hg/build-linux-2.6.18-xen_x86_64'
make -C build-linux-2.6.18-xen_x86_64 ARCH=x86_64 INSTALL_PATH=/ vmlinuz
make[3]: Entering directory
`/root/xen-unstable.hg/build-linux-2.6.18-xen_x86_64'
make -C /root/xen-unstable.hg/linux-2.6.18-xen
O=/root/xen-unstable.hg/build-linux-2.6.18-xen_x86_64 vmlinuz
Using /root/xen-unstable.hg/linux-2.6.18-xen as source for kernel
GEN /root/xen-unstable.hg/build-linux-2.6.18-xen_x86_64/Makefile
CHK include/linux/version.h
CHK include/linux/utsrelease.h
CHK include/linux/compile.h
CC lib/../arch/i386/kernel/swiotlb.o
/root/xen-unstable.hg/linux-2.6.18-xen/lib/../arch/i386/kernel/swiotlb.c:50:
error: static declaration of â??swiotlb_forceâ?? follows non-static
declaration
include2/asm/swiotlb.h:45: error: previous declaration of
â??swiotlb_forceâ?? was here
make[6]: *** [lib/../arch/i386/kernel/swiotlb.o] Error 1
make[5]: *** [lib] Error 2
make[4]: *** [vmlinuz] Error 2
make[3]: *** [vmlinuz] Error 2
make[3]: Leaving directory
`/root/xen-unstable.hg/build-linux-2.6.18-xen_x86_64'
make[2]: *** [build] Error 2
make[2]: Leaving directory `/root/xen-unstable.hg'
make[1]: *** [linux-2.6-xen-install] Error 2
make[1]: Leaving directory `/root/xen-unstable.hg'
make: *** [install-kernels] Error 1
Stefan
Keir Fraser <Keir.Fraser@cl.cam.ac.uk> wrote on 01/21/2007 10:30:33 AM:
> I don't see swiotlb_force used outside of swiotlb.c. How is the build
broken
> (it works for me)?
>
> -- Keir
>
> On 20/1/07 5:22 pm, "Stefan Berger" <stefanb@us.ibm.com> wrote:
>
> > This patch fixes Linux 2.6.18 compilation on x86-64 and also works on
> > i386.
> >
> > Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
> >
> >
> > _______________________________________________
> > Xen-devel mailing list
> > Xen-devel@lists.xensource.com
> > http://lists.xensource.com/xen-devel
>
>
[-- Attachment #1.2: Type: text/html, Size: 2819 bytes --]
[-- Attachment #2: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix linux compilation on x86-64
2007-01-21 15:30 ` Keir Fraser
2007-01-21 16:25 ` Stefan Berger
@ 2007-01-21 18:06 ` Stephan Seitz
2007-01-22 14:42 ` B Thomas
2 siblings, 0 replies; 6+ messages in thread
From: Stephan Seitz @ 2007-01-21 18:06 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1.1.1: Type: text/plain, Size: 1139 bytes --]
Keir Fraser schrieb:
> I don't see swiotlb_force used outside of swiotlb.c. How is the build broken
> (it works for me)?
On recent changesets i also changed swiotlb_force from static int to int to compile
on x86_64. (Left a bad smell, since I assume the definition in swiotlb.h is correct,
but i didn't checked really into the concerned code)
>
> -- Keir
>
> On 20/1/07 5:22 pm, "Stefan Berger" <stefanb@us.ibm.com> wrote:
>
>> This patch fixes Linux 2.6.18 compilation on x86-64 and also works on
>> i386.
>>
>> Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
>>
>>
>> _______________________________________________
>> Xen-devel mailing list
>> Xen-devel@lists.xensource.com
>> http://lists.xensource.com/xen-devel
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
--
Stephan Seitz
Senior System Administrator
*netz-haut* - multimediale kommunikation
zweierweg 22
97074 würzburg
fon: +49 931 2876247
fax: +49 931 2876248
web: www.netz-haut.de <http://www.netz-haut.de/>
[-- Attachment #1.1.2: s.seitz.vcf --]
[-- Type: text/x-vcard, Size: 335 bytes --]
begin:vcard
fn:Stephan Seitz
n:Seitz;Stephan
org:netz-haut e.K.
adr:;;Zweierweg 22;Wuerzburg;Bayern;97074;Deutschland
email;internet:s.seitz@netz-haut.de
title:Senior System Administrator
tel;work:+49-931-287-6247
tel;fax:+49-931-287-6248
x-mozilla-html:FALSE
url:http://www.schwarz-mode.de/files/
version:2.1
end:vcard
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 254 bytes --]
[-- Attachment #2: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix linux compilation on x86-64
2007-01-21 15:30 ` Keir Fraser
2007-01-21 16:25 ` Stefan Berger
2007-01-21 18:06 ` Stephan Seitz
@ 2007-01-22 14:42 ` B Thomas
2 siblings, 0 replies; 6+ messages in thread
From: B Thomas @ 2007-01-22 14:42 UTC (permalink / raw)
To: Keir Fraser; +Cc: xen-devel, Stefan Berger
[-- Attachment #1.1: Type: text/plain, Size: 4347 bytes --]
It's pretty clearly broken. On an FC6-based development system, I see the
swiotlb_force problem, but I haven't had the time to chase down a fix. My
first, no-time-involved guess would be the static int and extern int
combination, which is pretty much what the error message indicates. But, as
I've noted, composing this email is the most time that I've spent on this.
-b
CC lib/percpu_counter.o
CC lib/../arch/i386/kernel/swiotlb.o
/home/ben/src/xen-unstable.hg/linux-2.6.18-xen/lib/../arch/i386/kernel/swiotlb.c:50:
error: static declaration of 'swiotlb_force' follows non-static declaration
include2/asm/swiotlb.h:45: error: previous declaration of 'swiotlb_force'
was here
make[6]: *** [lib/../arch/i386/kernel/swiotlb.o] Error 1
make[5]: *** [lib] Error 2
make[4]: *** [vmlinuz] Error 2
make[3]: *** [vmlinuz] Error 2
make[3]: Leaving directory `/home/ben/src/xen-unstable.hg/build-
linux-2.6.18-xen_x86_64'
make[2]: *** [build] Error 2
make[2]: Leaving directory `/home/ben/src/xen-unstable.hg'
make[1]: *** [linux-2.6-xen-install] Error 2
make[1]: Leaving directory `/home/ben/src/xen-unstable.hg'
make: *** [install-kernels] Error 1
[ben@bthomas2 xen-unstable.hg]$ grep -rI swiotlb_force *
build-linux-2.6.18-xen_x86_64/include2/asm/swiotlb.h:extern int
swiotlb_force;
linux-2.6.18-xen/arch/i386/kernel/swiotlb.c:static int swiotlb_force;
linux-2.6.18-xen/arch/i386/kernel/swiotlb.c: swiotlb_force = 1;
linux-2.6.18-xen/arch/i386/kernel/swiotlb.c: swiotlb_force = -1;
linux-2.6.18-xen/arch/i386/kernel/swiotlb.c: if (swiotlb_force == 1) {
linux-2.6.18-xen/arch/i386/kernel/swiotlb.c: } else if ((swiotlb_force !=
-1) &&
linux-2.6.18-xen/arch/x86_64/kernel/pci-swiotlb-xen.c: if (swiotlb_force)
linux-2.6.18-xen/arch/x86_64/kernel/pci-swiotlb.c: if (swiotlb_force)
linux-2.6.18-xen/include/asm-x86_64/swiotlb.h:extern int swiotlb_force;
linux-2.6.18-xen/lib/swiotlb.c:int swiotlb_force;
linux-2.6.18-xen/lib/swiotlb.c: swiotlb_force = 1;
linux-2.6.18-xen/lib/swiotlb.c: if (!address_needs_mapping(hwdev, dev_addr)
&& !swiotlb_force)
linux-2.6.18-xen/lib/swiotlb.c: if (swiotlb_force ||
address_needs_mapping(hwdev, dev_addr)) {
linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c:static int swiotlb_force;
linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c:
swiotlb_force = 1;
linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c:
swiotlb_force = -1;
linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c: if (swiotlb_force ==
1) {
linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c: } else if
((swiotlb_force != -1) &&
linux-2.6-xen-sparse/arch/x86_64/kernel/pci-swiotlb-xen.c: if
(swiotlb_force)
pristine-linux-2.6.18/arch/x86_64/kernel/pci-swiotlb.c: if (swiotlb_force)
pristine-linux-2.6.18/include/asm-x86_64/swiotlb.h:extern int swiotlb_force;
pristine-linux-2.6.18/lib/swiotlb.c:int swiotlb_force;
pristine-linux-2.6.18/lib/swiotlb.c: swiotlb_force = 1;
pristine-linux-2.6.18/lib/swiotlb.c: if (!address_needs_mapping(hwdev,
dev_addr) && !swiotlb_force)
pristine-linux-2.6.18/lib/swiotlb.c: if (swiotlb_force ||
address_needs_mapping(hwdev, dev_addr)) {
ref-linux-2.6.18/arch/x86_64/kernel/pci-swiotlb.c: if (swiotlb_force)
ref-linux-2.6.18/include/asm-x86_64/swiotlb.h:extern int swiotlb_force;
ref-linux-2.6.18/lib/swiotlb.c:int swiotlb_force;
ref-linux-2.6.18/lib/swiotlb.c: swiotlb_force = 1;
ref-linux-2.6.18/lib/swiotlb.c: if (!address_needs_mapping(hwdev, dev_addr)
&& !swiotlb_force)
ref-linux-2.6.18/lib/swiotlb.c: if (swiotlb_force ||
address_needs_mapping(hwdev, dev_addr)) {
[ben@bthomas2 xen-unstable.hg]$
On 1/21/07, Keir Fraser <Keir.Fraser@cl.cam.ac.uk> wrote:
>
> I don't see swiotlb_force used outside of swiotlb.c. How is the build
> broken
> (it works for me)?
>
> -- Keir
>
> On 20/1/07 5:22 pm, "Stefan Berger" <stefanb@us.ibm.com> wrote:
>
> > This patch fixes Linux 2.6.18 compilation on x86-64 and also works on
> > i386.
> >
> > Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
> >
> >
> > _______________________________________________
> > Xen-devel mailing list
> > Xen-devel@lists.xensource.com
> > http://lists.xensource.com/xen-devel
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
>
[-- Attachment #1.2: Type: text/html, Size: 6052 bytes --]
[-- Attachment #2: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-01-22 14:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-20 17:22 [PATCH] Fix linux compilation on x86-64 Stefan Berger
2007-01-21 6:57 ` Muli Ben-Yehuda
2007-01-21 15:30 ` Keir Fraser
2007-01-21 16:25 ` Stefan Berger
2007-01-21 18:06 ` Stephan Seitz
2007-01-22 14:42 ` B Thomas
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.