From: "Moritz Mühlenhoff" <muehlenhoff@univention.de>
To: "xen-devel@lists.xen.org" <xen-devel@lists.xen.org>
Subject: Compilation fixes for blktap kernel patch
Date: Fri, 5 Oct 2012 10:31:13 +0200 [thread overview]
Message-ID: <201210051031.13377.muehlenhoff@univention.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 829 bytes --]
Hi,
I hope this is the correct mailing list for the blktap patches available at
ftp://ftp.enjellic.com/pub/xen/ ?
When integrating the patch into Linux 3.2.30 I noticed two compile errors
related to a missing include of module.h:
/var/build/temp/tmp.TujmUayDmG/3.1-0-0/linux/linux-3.2.30/drivers/block/blktap/ring.c:536:
error: 'THIS_MODULE' undeclared here (not in a function)
I'm attaching patches against the
ftp://ftp.enjellic.com/pub/xen/blktap2-3.2.patch patch
Cheers,
Moritz
--
Moritz Mühlenhoff
Open Source Software Engineer
Univention GmbH
be open.
Mary-Somerville-Str.1
28359 Bremen
Tel. : +49 421 22232-0 [.....]
Fax : +49 421 22232-99
muehlenhoff@univention.de
http://www.univention.de
Geschäftsführer: Peter H. Ganten
HRB 20755 Amtsgericht Bremen
Steuer-Nr.: 71-597-02876
[-- Attachment #2: fix-blktap-patch1.diff --]
[-- Type: text/x-patch, Size: 837 bytes --]
From: Moritz Mühlenhoff <muehlenhoff@univention.de>
ring.c uses THIS_MODULE, so it needs to include <linux/module.h>
Signed-off-by Moritz Mühlenhoff <muehlenhoff@univention.de>
--- 30-add-blktap-driver.patch.orig 2012-10-04 11:19:26.784050570 +0200
+++ 30-add-blktap-driver.patch 2012-10-04 11:18:51.244048852 +0200
@@ -1571,13 +1571,14 @@
diff -urNp v3.2/linux-3.2/drivers/block/blktap/ring.c linux-3.2/drivers/block/blktap/ring.c
--- v3.2/linux-3.2/drivers/block/blktap/ring.c Wed Dec 31 18:00:00 1969
+++ linux-3.2/drivers/block/blktap/ring.c Mon Apr 9 14:48:24 2012
-@@ -0,0 +1,645 @@
+@@ -0,0 +1,646 @@
+
+#include <linux/device.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/poll.h>
+#include <linux/blkdev.h>
++#include <linux/module.h>
+
+#include "blktap.h"
+
[-- Attachment #3: fix-blktap-patch2.diff --]
[-- Type: text/x-patch, Size: 867 bytes --]
From: Moritz Mühlenhoff <muehlenhoff@univention.de>
device.c uses THIS_MODULE, so it needs to include <linux/module.h>
Signed-off-by Moritz Mühlenhoff <muehlenhoff@univention.de>
--- 30-add-blktap-driver.patch.orig 2012-10-04 11:18:51.244048852 +0200
+++ 30-add-blktap-driver.patch 2012-10-04 11:56:19.812157693 +0200
@@ -526,12 +526,13 @@
diff -urNp v3.2/linux-3.2/drivers/block/blktap/device.c linux-3.2/drivers/block/blktap/device.c
--- v3.2/linux-3.2/drivers/block/blktap/device.c Wed Dec 31 18:00:00 1969
+++ linux-3.2/drivers/block/blktap/device.c Mon Apr 9 14:48:24 2012
-@@ -0,0 +1,618 @@
+@@ -0,0 +1,619 @@
+#include <linux/fs.h>
+#include <linux/blkdev.h>
+#include <linux/cdrom.h>
+#include <linux/hdreg.h>
+#include <linux/log2.h>
++#include <linux/module.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_ioctl.h>
+
[-- Attachment #4: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next reply other threads:[~2012-10-05 8:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-05 8:31 Moritz Mühlenhoff [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-10-05 23:57 Compilation fixes for blktap kernel patch Dr. Greg Wettstein
2012-10-06 19:12 ` Pasi Kärkkäinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201210051031.13377.muehlenhoff@univention.de \
--to=muehlenhoff@univention.de \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).