Skip to contentSkip to conversation

allow modular mtdsuper

mtd Jason Lunz 3 participants 3 messages Sep 4, 2007 – Sep 21, 2007 Memory technology devices (MTD)

lore
Share & tools
lore

Jason Lunz

author
#0 lore raw

Declare mtdsuper to be gpl-licensed so it can access get_mtd_device and put_mtd_device when loaded as a module.

---
 drivers/mtd/mtdsuper.c |    1 +
 1 file changed, 1 insertion(+)
drivers/mtd/mtdsuper.c +2 -0
Index: 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
#1 lore raw

Hi Jason,

Quoted 3 lines · Jason Lunz

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.

---

 drivers/mtd/Makefile  |    2 +-
 drivers/mtd/mtdpart.c |    4 ----
 2 files changed, 1 insertions(+), 5 deletions(-)
drivers/mtd/Makefile +1 -1
index 451adcc..6d958a4 100644
@@ -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
drivers/mtd/mtdpart.c +0 -4
index 9c62368..6174a97 100644
@@ -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 <[email protected]>");
-MODULE_DESCRIPTION("Generic support for partitioning of MTD devices");
#2 lore raw

patch mtd-makefile-fix-for-mtdsuper.patch queued to -stable tree

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

Quoted 1 line

From [email protected] Tue Sep 4 15:57:55 2007

From: Satyam Sharma <[email protected]>
Date: Wed, 5 Sep 2007 04:40:52 +0530 (IST)
Subject: MTD: Makefile fix for mtdsuper
To: Jason Lunz <[email protected]>
Cc: David Woodhouse <[email protected]>, lkml <[email protected]>, Stable Branch <[email protected]>
Message-ID: <[email protected]>

From: Satyam Sharma <[email protected]>

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.

drivers/mtd/Makefile +1 -1
@@ -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
drivers/mtd/mtdpart.c +0 -4
index 9c62368..6174a97 100644
@@ -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 <[email protected]>");
-MODULE_DESCRIPTION("Generic support for partitioning of MTD devices");

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Patches currently in stable-queue which might be from [email protected] are

queue-2.6.22/mtd-makefile-fix-for-mtdsuper.patch