* [mtd] allow modular mtdsuper
@ 2007-09-04 22:21 Jason Lunz
2007-09-04 23:10 ` Satyam Sharma
0 siblings, 1 reply; 3+ messages in thread
From: Jason Lunz @ 2007-09-04 22:21 UTC (permalink / raw)
To: David Woodhouse; +Cc: lkml
Declare mtdsuper to be gpl-licensed so it can access get_mtd_device and
put_mtd_device when loaded as a module.
Signed-off-by: Jason Lunz <lunz@falooley.org>
---
drivers/mtd/mtdsuper.c | 1 +
1 file changed, 1 insertion(+)
Index: linux-2.6.22.6-uml/drivers/mtd/mtdsuper.c
===================================================================
--- linux-2.6.22.6-uml.orig/drivers/mtd/mtdsuper.c
+++ linux-2.6.22.6-uml/drivers/mtd/mtdsuper.c
@@ -14,6 +14,8 @@
#include <linux/namei.h>
#include <linux/ctype.h>
+MODULE_LICENSE("GPL");
+
/*
* compare superblocks to see if they're equivalent
* - they are if the underlying MTD device is the same
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [mtd] allow modular mtdsuper
2007-09-04 22:21 [mtd] allow modular mtdsuper Jason Lunz
@ 2007-09-04 23:10 ` Satyam Sharma
2007-09-21 21:31 ` patch mtd-makefile-fix-for-mtdsuper.patch queued to -stable tree gregkh
0 siblings, 1 reply; 3+ messages in thread
From: Satyam Sharma @ 2007-09-04 23:10 UTC (permalink / raw)
To: Jason Lunz; +Cc: David Woodhouse, lkml, Stable Branch
Hi Jason,
On Tue, 4 Sep 2007, Jason Lunz wrote:
>
> Declare mtdsuper to be gpl-licensed so it can access get_mtd_device and
> put_mtd_device when loaded as a module.
The actual issue was a bit different -- refer commit bec494775600b1cd in
latest -git (patch included below).
David, it looks like .22 had this problem as well. If we care enough, you
could forward this on to -stable (cc'ed, just in case).
Satyam
[MTD] Makefile fix for mtdsuper
We want drivers/mtd/{mtdcore, mtdsuper, mtdpart}.c to be built and linked
into the same mtd.ko module. Fix the Makefile to ensure this, and remove
duplicate MODULE_ declarations in mtdpart.c, as mtdcore.c already has them.
Signed-off-by: Satyam Sharma <satyam@infradead.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---
drivers/mtd/Makefile | 2 +-
drivers/mtd/mtdpart.c | 4 ----
2 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 451adcc..6d958a4 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -3,9 +3,9 @@
#
# Core functionality.
+obj-$(CONFIG_MTD) += mtd.o
mtd-y := mtdcore.o mtdsuper.o
mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o
-obj-$(CONFIG_MTD) += $(mtd-y)
obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 9c62368..6174a97 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -560,7 +560,3 @@ int parse_mtd_partitions(struct mtd_info *master, const char **types,
EXPORT_SYMBOL_GPL(parse_mtd_partitions);
EXPORT_SYMBOL_GPL(register_mtd_parser);
EXPORT_SYMBOL_GPL(deregister_mtd_parser);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Nicolas Pitre <nico@cam.org>");
-MODULE_DESCRIPTION("Generic support for partitioning of MTD devices");
^ permalink raw reply [flat|nested] 3+ messages in thread
* patch mtd-makefile-fix-for-mtdsuper.patch queued to -stable tree
2007-09-04 23:10 ` Satyam Sharma
@ 2007-09-21 21:31 ` gregkh
0 siblings, 0 replies; 3+ messages in thread
From: gregkh @ 2007-09-21 21:31 UTC (permalink / raw)
To: satyam, dwmw2, gregkh, linux-kernel, lunz, stable; +Cc: stable-commits
This is a note to let you know that we have just queued up the patch titled
Subject: MTD: Makefile fix for mtdsuper
to the 2.6.22-stable tree. Its filename is
mtd-makefile-fix-for-mtdsuper.patch
A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>From stable-bounces@linux.kernel.org Tue Sep 4 15:57:55 2007
From: Satyam Sharma <satyam@infradead.org>
Date: Wed, 5 Sep 2007 04:40:52 +0530 (IST)
Subject: MTD: Makefile fix for mtdsuper
To: Jason Lunz <lunz@falooley.org>
Cc: David Woodhouse <dwmw2@infradead.org>, lkml <linux-kernel@vger.kernel.org>, Stable Branch <stable@kernel.org>
Message-ID: <alpine.LFD.0.999.0709050421330.20571@enigma.security.iitk.ac.in>
From: Satyam Sharma <satyam@infradead.org>
commit bec494775600b1cd7c144d31a09e1f46df9c6324 in mainline.
We want drivers/mtd/{mtdcore, mtdsuper, mtdpart}.c to be built and linked
into the same mtd.ko module. Fix the Makefile to ensure this, and remove
duplicate MODULE_ declarations in mtdpart.c, as mtdcore.c already has them.
Signed-off-by: Satyam Sharma <satyam@infradead.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -3,9 +3,9 @@
#
# Core functionality.
+obj-$(CONFIG_MTD) += mtd.o
mtd-y := mtdcore.o mtdsuper.o
mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o
-obj-$(CONFIG_MTD) += $(mtd-y)
obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 9c62368..6174a97 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -560,7 +560,3 @@ int parse_mtd_partitions(struct mtd_info *master, const char **types,
EXPORT_SYMBOL_GPL(parse_mtd_partitions);
EXPORT_SYMBOL_GPL(register_mtd_parser);
EXPORT_SYMBOL_GPL(deregister_mtd_parser);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Nicolas Pitre <nico@cam.org>");
-MODULE_DESCRIPTION("Generic support for partitioning of MTD devices");
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
Patches currently in stable-queue which might be from satyam@infradead.org are
queue-2.6.22/mtd-makefile-fix-for-mtdsuper.patch
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-09-21 21:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-09-04 22:21 [mtd] allow modular mtdsuper Jason Lunz
2007-09-04 23:10 ` Satyam Sharma
2007-09-21 21:31 ` patch mtd-makefile-fix-for-mtdsuper.patch queued to -stable tree gregkh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®