mol and 2.6.19-rc?
Hi,
in order to build mol-modules with kernel 2.6.19-rc3 we need the
attached patches. A bugreport is useles at the moment, as 2.6.19
isn't in our repository yet, though.
I am not subscribed to pkg-mol-devel.
Elimar
--
On the keyboard of life you have always
to keep a finger at the escape key;-)
#! /bin/sh /usr/share/dpatch/dpatch-run
## sheep_2.6.19.dpatch by Andreas Schwab <schwab@suse.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Change modload script to use modprobe and to give debian specific error
## DP: messages
@DPATCH@
diff -ur mol-0.9.71.dfsg~/src/netdriver/sheep.c mol-0.9.71.dfsg/src/netdriver/sheep.c
--- mol-0.9.71.dfsg~/src/netdriver/sheep.c 2005-10-10 03:54:32.000000000 +0200
+++ mol-0.9.71.dfsg/src/netdriver/sheep.c 2006-10-27 22:08:38.000000000 +0200
@@ -368,8 +368,9 @@
}
static ssize_t
-sheep_net_readv( struct file *f, const struct iovec *iv, unsigned long count, loff_t *pos )
+sheep_net_aio_read(struct kiocb *iocb, const struct iovec *iv, unsigned long count, loff_t pos)
{
+ struct file *f = iocb->ki_filp;
struct SheepVars *v = (struct SheepVars *)f->private_data;
struct sk_buff *skb;
int size = get_iovsize( iv, count );
@@ -398,8 +399,9 @@
}
static ssize_t
-sheep_net_writev( struct file *f, const struct iovec *iv, unsigned long count, loff_t *off )
+sheep_net_aio_write(struct kiocb *iocb, const struct iovec *iv, unsigned long count, loff_t off)
{
+ struct file *f = iocb->ki_filp;
struct SheepVars *v = (struct SheepVars *)f->private_data;
struct sk_buff *skb;
int size = get_iovsize( iv, count );
@@ -471,24 +473,6 @@
return size;
}
-static ssize_t
-sheep_net_read( struct file *f, char *buf, size_t count, loff_t *off )
-{
- struct iovec iv;
- iv.iov_base = buf;
- iv.iov_len = count;
- return sheep_net_readv( f, &iv, 1, off );
-}
-
-static ssize_t
-sheep_net_write( struct file *f, const char *buf, size_t count, loff_t *off )
-{
- struct iovec iv;
- iv.iov_len = count;
- iv.iov_base = (char *)buf;
- return sheep_net_writev( f, &iv, 1, off );
-}
-
static unsigned int
sheep_net_poll( struct file *f, struct poll_table_struct *wait )
{
@@ -625,10 +609,10 @@
static struct file_operations sheep_net_fops = {
.owner = THIS_MODULE,
- .read = sheep_net_read,
- .write = sheep_net_write,
- .readv = sheep_net_readv,
- .writev = sheep_net_writev,
+ .read = do_sync_read,
+ .aio_read = sheep_net_aio_read,
+ .write = do_sync_write,
+ .aio_write = sheep_net_aio_write,
.poll = sheep_net_poll,
.ioctl = sheep_net_ioctl,
.open = sheep_net_open,
#! /bin/sh /usr/share/dpatch/dpatch-run
## molmodules_build_2.6.19.dpatch by Elimar Riesebieter <riesebie@lxtec.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Change modload script to use modprobe and to give debian specific error
## DP: messages
@DPATCH@
diff -ur mol~/src/kmod/Linux/archinclude.h mol/src/kmod/Linux/archinclude.h
--- mol~/src/kmod/Linux/archinclude.h 2006-10-07 17:57:59.000000000 +0200
+++ mol/src/kmod/Linux/archinclude.h 2006-10-14 21:00:13.000000000 +0200
@@ -24,9 +24,18 @@
#include "mol_config.h"
#include "kconfig.h"
-#include <linux/config.h>
#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+#include <linux/utsrelease.h>
+#endif
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
+#include <linux/config.h>
+#else
+#include <linux/autoconf.h>
+#endif
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
#define LINUX_26
#endif
diff -ur mol~/src/kmod/Linux/dev.c mol/src/kmod/Linux/dev.c
--- mol~/src/kmod/Linux/dev.c 2006-10-07 17:57:59.000000000 +0200
+++ mol/src/kmod/Linux/dev.c 2006-10-14 21:00:13.000000000 +0200
@@ -15,7 +15,6 @@
*/
#include "archinclude.h"
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/miscdevice.h>
#include <linux/spinlock.h>
diff -ur mol~/src/kmod/Linux/kuname.c mol/src/kmod/Linux/kuname.c
--- mo~/src/kmod/Linux/kuname.c 2006-10-07 17:57:59.000000000 +0200
+++ mol/src/kmod/Linux/kuname.c 2006-10-14 21:00:13.000000000 +0200
@@ -14,12 +14,18 @@
*
*/
-#include <linux/config.h>
#include <linux/version.h>
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
#include <linux/utsrelease.h>
#endif
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
+#include <linux/config.h>
+#else
+#include <linux/autoconf.h>
+#endif
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
#ifdef CONFIG_SMP
diff -ur mol~/src/netdriver/kuname.c mol/src/netdriver/kuname.c
--- mol~/src/netdriver/kuname.c 2006-10-07 17:57:59.000000000 +0200
+++ mol/src/netdriver/kuname.c 2006-10-14 21:00:13.000000000 +0200
@@ -14,12 +14,18 @@
*
*/
-#include <linux/config.h>
#include <linux/version.h>
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
#include <linux/utsrelease.h>
#endif
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
+#include <linux/config.h>
+#else
+#include <linux/autoconf.h>
+#endif
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
#ifdef CONFIG_SMP
Reply to: