* [uml-devel] [PATCH?] 2.6.15-rc1 + sf.net patches on x86 needs a patch
@ 2005-11-22 18:20 Antoine Martin
2005-11-22 18:31 ` [uml-devel] " Antoine Martin
0 siblings, 1 reply; 4+ messages in thread
From: Antoine Martin @ 2005-11-22 18:20 UTC (permalink / raw)
To: Jeff Dike, UML devel
[-- Attachment #1: Type: text/plain, Size: 1453 bytes --]
patch attached, I've no idea what I've done really, but it builds ok now.
This time on an x86 box:
wget ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2
wget ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.15-rc1.bz2
wget http://user-mode-linux.sourceforge.net/work/current/2.6/2.6.15-rc1/patches.tar
tar -xf patches.tar
tar -jxf linux-2.6.14.tar.bz2
mv linux-2.6.14 linux-2.6.15-rc1-uml
cd linux-2.6.15-rc1-uml
bzcat ../patch-2.6.15-rc1.bz2 | patch -p1
for patch in `cat ../patches/series`; do echo $patch; patch -p1 < ../patches/$patch; done
find . -type f -size 0 -exec rm {} \;
make ARCH=um defconfig
make ARCH=um vmlinux
LD arch/um/drivers/net.o
LD arch/um/drivers/mconsole.o
LD arch/um/drivers/ubd.o
CC arch/um/drivers/null.o
LD arch/um/drivers/port.o
CC arch/um/drivers/pty.o
CC arch/um/drivers/tty.o
CC arch/um/drivers/cow_user.o
CC arch/um/drivers/random.o
LD arch/um/drivers/built-in.o
CC arch/um/os-Linux/aio.o
arch/um/os-Linux/aio.c: In function ‘init_aio_26’:
arch/um/os-Linux/aio.c:402: error: ‘finish_aio_26’ undeclared (first use in this function)
arch/um/os-Linux/aio.c:402: error: (Each undeclared identifier is reported only once
arch/um/os-Linux/aio.c:402: error: for each function it appears in.)
make[1]: *** [arch/um/os-Linux/aio.o] Error 1
make: *** [arch/um/os-Linux] Error 2
Antoine
[-- Attachment #2: 2.6.15-rc1-uml-ifdefcompilefix.patch --]
[-- Type: text/x-patch, Size: 482 bytes --]
--- linux-2.6.15-rc1-uml/arch/um/os-Linux/aio.c 2005-11-22 18:14:55.000000000 +0000
+++ linux-2.6.15-rc1-uml-fixed/arch/um/os-Linux/aio.c 2005-11-22 18:09:35.000000000 +0000
@@ -389,8 +389,6 @@
goto out;
}
-#else
-#define DEFAULT_24_AIO 1
static int submit_aio_26(struct aio_context *aio)
{
return -ENOSYS;
@@ -402,6 +400,8 @@
finish_proc = finish_aio_26;
return -ENOSYS;
}
+#else
+#define DEFAULT_24_AIO 1
#endif
static int aio_24 = DEFAULT_24_AIO;
^ permalink raw reply [flat|nested] 4+ messages in thread* [uml-devel] Re: [PATCH?] 2.6.15-rc1 + sf.net patches on x86 needs a patch
2005-11-22 18:20 [uml-devel] [PATCH?] 2.6.15-rc1 + sf.net patches on x86 needs a patch Antoine Martin
@ 2005-11-22 18:31 ` Antoine Martin
2005-11-22 18:38 ` Antoine Martin
0 siblings, 1 reply; 4+ messages in thread
From: Antoine Martin @ 2005-11-22 18:31 UTC (permalink / raw)
To: Jeff Dike; +Cc: UML devel
Ignore that, it does not solve anything. Just delays the problem until
link time.
Anyone know why my kernel headers don't have aio_abi.h?
Antoine
On Tue, 2005-11-22 at 18:20 +0000, Antoine Martin wrote:
> patch attached, I've no idea what I've done really, but it builds ok now.
>
> This time on an x86 box:
>
> wget ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2
> wget ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.15-rc1.bz2
> wget http://user-mode-linux.sourceforge.net/work/current/2.6/2.6.15-rc1/patches.tar
> tar -xf patches.tar
> tar -jxf linux-2.6.14.tar.bz2
> mv linux-2.6.14 linux-2.6.15-rc1-uml
> cd linux-2.6.15-rc1-uml
> bzcat ../patch-2.6.15-rc1.bz2 | patch -p1
> for patch in `cat ../patches/series`; do echo $patch; patch -p1 < ../patches/$patch; done
> find . -type f -size 0 -exec rm {} \;
> make ARCH=um defconfig
> make ARCH=um vmlinux
> LD arch/um/drivers/net.o
> LD arch/um/drivers/mconsole.o
> LD arch/um/drivers/ubd.o
> CC arch/um/drivers/null.o
> LD arch/um/drivers/port.o
> CC arch/um/drivers/pty.o
> CC arch/um/drivers/tty.o
> CC arch/um/drivers/cow_user.o
> CC arch/um/drivers/random.o
> LD arch/um/drivers/built-in.o
> CC arch/um/os-Linux/aio.o
> arch/um/os-Linux/aio.c: In function ‘init_aio_26’:
> arch/um/os-Linux/aio.c:402: error: ‘finish_aio_26’ undeclared (first use in this function)
> arch/um/os-Linux/aio.c:402: error: (Each undeclared identifier is reported only once
> arch/um/os-Linux/aio.c:402: error: for each function it appears in.)
> make[1]: *** [arch/um/os-Linux/aio.o] Error 1
> make: *** [arch/um/os-Linux] Error 2
>
> Antoine
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc. Get Certified Today
Register for a JBoss Training Course. Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_idv28&alloc_id\x16845&opМk
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
^ permalink raw reply [flat|nested] 4+ messages in thread* [uml-devel] Re: [PATCH?] 2.6.15-rc1 + sf.net patches on x86 needs a patch
2005-11-22 18:31 ` [uml-devel] " Antoine Martin
@ 2005-11-22 18:38 ` Antoine Martin
2005-11-22 18:52 ` Antoine Martin
0 siblings, 1 reply; 4+ messages in thread
From: Antoine Martin @ 2005-11-22 18:38 UTC (permalink / raw)
To: Jeff Dike; +Cc: UML devel
[-- Attachment #1: Type: text/plain, Size: 2352 bytes --]
This patch attached *does* make it build, but it's not right.
The build moans at me for using the kernel headers... ok I shouldn't.
CC arch/um/os-Linux/aio.o
In file included from /usr/src/linux/include/linux/aio_abi.h:30,
from arch/um/os-Linux/aio.c:47:
/usr/include/asm/byteorder.h:6:2: warning: #warning using private kernel
header; include <endian.h> instead!
How do I get the new headers for my manually compiled kernel?
Antoine
On Tue, 2005-11-22 at 18:31 +0000, Antoine Martin wrote:
> Ignore that, it does not solve anything. Just delays the problem until
> link time.
> Anyone know why my kernel headers don't have aio_abi.h?
>
> Antoine
>
> On Tue, 2005-11-22 at 18:20 +0000, Antoine Martin wrote:
> > patch attached, I've no idea what I've done really, but it builds ok now.
> >
> > This time on an x86 box:
> >
> > wget ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2
> > wget ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.15-rc1.bz2
> > wget http://user-mode-linux.sourceforge.net/work/current/2.6/2.6.15-rc1/patches.tar
> > tar -xf patches.tar
> > tar -jxf linux-2.6.14.tar.bz2
> > mv linux-2.6.14 linux-2.6.15-rc1-uml
> > cd linux-2.6.15-rc1-uml
> > bzcat ../patch-2.6.15-rc1.bz2 | patch -p1
> > for patch in `cat ../patches/series`; do echo $patch; patch -p1 < ../patches/$patch; done
> > find . -type f -size 0 -exec rm {} \;
> > make ARCH=um defconfig
> > make ARCH=um vmlinux
> > LD arch/um/drivers/net.o
> > LD arch/um/drivers/mconsole.o
> > LD arch/um/drivers/ubd.o
> > CC arch/um/drivers/null.o
> > LD arch/um/drivers/port.o
> > CC arch/um/drivers/pty.o
> > CC arch/um/drivers/tty.o
> > CC arch/um/drivers/cow_user.o
> > CC arch/um/drivers/random.o
> > LD arch/um/drivers/built-in.o
> > CC arch/um/os-Linux/aio.o
> > arch/um/os-Linux/aio.c: In function ‘init_aio_26’:
> > arch/um/os-Linux/aio.c:402: error: ‘finish_aio_26’ undeclared (first use in this function)
> > arch/um/os-Linux/aio.c:402: error: (Each undeclared identifier is reported only once
> > arch/um/os-Linux/aio.c:402: error: for each function it appears in.)
> > make[1]: *** [arch/um/os-Linux/aio.o] Error 1
> > make: *** [arch/um/os-Linux] Error 2
> >
> > Antoine
[-- Attachment #2: 2.6.15-rc1-uml-aioheader-dodgyfix.patch --]
[-- Type: text/x-patch, Size: 489 bytes --]
--- linux-2.6.15-rc1-uml/arch/um/os-Linux/aio.c 2005-11-22 18:14:55.000000000 +0000
+++ linux-2.6.15-rc1-uml-fixed/arch/um/os-Linux/aio.c 2005-11-22 18:34:24.000000000 +0000
@@ -41,8 +41,10 @@
return 0;
}
+#define HAVE_AIO_ABI 1
+
#if defined(HAVE_AIO_ABI)
-#include <linux/aio_abi.h>
+#include </usr/src/linux/include/linux/aio_abi.h>
/* If we have the headers, we are going to build with AIO enabled.
* If we don't have aio in libc, we define the necessary stubs here.
^ permalink raw reply [flat|nested] 4+ messages in thread* [uml-devel] Re: [PATCH?] 2.6.15-rc1 + sf.net patches on x86 needs a patch
2005-11-22 18:38 ` Antoine Martin
@ 2005-11-22 18:52 ` Antoine Martin
0 siblings, 0 replies; 4+ messages in thread
From: Antoine Martin @ 2005-11-22 18:52 UTC (permalink / raw)
To: Jeff Dike; +Cc: UML devel
On Tue, 2005-11-22 at 18:38 +0000, Antoine Martin wrote:
> This patch attached *does* make it build, but it's not right.
> The build moans at me for using the kernel headers... ok I shouldn't.
>
> CC arch/um/os-Linux/aio.o
> In file included from /usr/src/linux/include/linux/aio_abi.h:30,
> from arch/um/os-Linux/aio.c:47:
> /usr/include/asm/byteorder.h:6:2: warning: #warning using private kernel
> header; include <endian.h> instead!
DOH DOH DOH
Founds this a few lines lower:
aio=2.4
This is used to force UML to use 2.4-style AIO even when 2.6 AIO is
available. 2.4 AIO is a single thread that handles one request at a
time, synchronously. 2.6 AIO is a thread which uses the 2.6 AIO
interface to handle an arbitrary number of pending requests. 2.6 AIO
is not available in tt mode, on 2.4 hosts, or when UML is built with
/usr/include/linux/aio_abi.h not available. Many distributions don't
include aio_abi.h, so you will need to copy it from a kernel tree to
your /usr/include/linux in order to build an AIO-capable UML
Apologies for spamming the list for nothing, I will go and find a hole
to hide in now.
Antoine
>
> Antoine
>
> On Tue, 2005-11-22 at 18:31 +0000, Antoine Martin wrote:
> > Ignore that, it does not solve anything. Just delays the problem until
> > link time.
> > Anyone know why my kernel headers don't have aio_abi.h?
> >
> > Antoine
> >
> > On Tue, 2005-11-22 at 18:20 +0000, Antoine Martin wrote:
> > > patch attached, I've no idea what I've done really, but it builds ok now.
> > >
> > > This time on an x86 box:
> > >
> > > wget ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2
> > > wget ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.15-rc1.bz2
> > > wget http://user-mode-linux.sourceforge.net/work/current/2.6/2.6.15-rc1/patches.tar
> > > tar -xf patches.tar
> > > tar -jxf linux-2.6.14.tar.bz2
> > > mv linux-2.6.14 linux-2.6.15-rc1-uml
> > > cd linux-2.6.15-rc1-uml
> > > bzcat ../patch-2.6.15-rc1.bz2 | patch -p1
> > > for patch in `cat ../patches/series`; do echo $patch; patch -p1 < ../patches/$patch; done
> > > find . -type f -size 0 -exec rm {} \;
> > > make ARCH=um defconfig
> > > make ARCH=um vmlinux
> > > LD arch/um/drivers/net.o
> > > LD arch/um/drivers/mconsole.o
> > > LD arch/um/drivers/ubd.o
> > > CC arch/um/drivers/null.o
> > > LD arch/um/drivers/port.o
> > > CC arch/um/drivers/pty.o
> > > CC arch/um/drivers/tty.o
> > > CC arch/um/drivers/cow_user.o
> > > CC arch/um/drivers/random.o
> > > LD arch/um/drivers/built-in.o
> > > CC arch/um/os-Linux/aio.o
> > > arch/um/os-Linux/aio.c: In function ‘init_aio_26’:
> > > arch/um/os-Linux/aio.c:402: error: ‘finish_aio_26’ undeclared (first use in this function)
> > > arch/um/os-Linux/aio.c:402: error: (Each undeclared identifier is reported only once
> > > arch/um/os-Linux/aio.c:402: error: for each function it appears in.)
> > > make[1]: *** [arch/um/os-Linux/aio.o] Error 1
> > > make: *** [arch/um/os-Linux] Error 2
> > >
> > > Antoine
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc. Get Certified Today
Register for a JBoss Training Course. Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_idv28&alloc_id\x16845&opМk
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2005-11-22 18:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-11-22 18:20 [uml-devel] [PATCH?] 2.6.15-rc1 + sf.net patches on x86 needs a patch Antoine Martin
2005-11-22 18:31 ` [uml-devel] " Antoine Martin
2005-11-22 18:38 ` Antoine Martin
2005-11-22 18:52 ` Antoine Martin
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.