* linux-next: manual merge of the bkl-trivial tree with the mmc tree
@ 2010-09-20 4:58 Stephen Rothwell
2010-09-20 9:15 ` Arnd Bergmann
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-09-20 4:58 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-next, linux-kernel, Olof Johansson, Chris Ball
Hi Arnd,
Today's linux-next merge of the bkl-trivial tree got a conflict in
drivers/mmc/card/block.c between commit
28280d210bacf6788a5e4b12c5a9430bd50860b4 ("mmc: make number of mmcblk
minors configurable") from the mmc tree and commit
5778067afcfd8b718ffc3744c25fdd194fc886a1 ("block: autoconvert trivial BKL
users to private mutex") from the bkl-trivial tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/mmc/card/block.c
index 5568044,00073b7..0000000
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@@ -44,26 -43,15 +43,27 @@@
#include "queue.h"
MODULE_ALIAS("mmc:block");
+#ifdef MODULE_PARAM_PREFIX
+#undef MODULE_PARAM_PREFIX
+#endif
+#define MODULE_PARAM_PREFIX "mmcblk."
+
+
+/*
+ * The defaults come from config options but can be overriden by module
+ * or bootarg options.
+ */
+static int perdev_minors = CONFIG_MMC_BLOCK_MINORS;
/*
- * max 8 partitions per card
+ * We've only got one major, so number of mmcblk devices is
+ * limited to 256 / number of minors per device.
*/
-#define MMC_SHIFT 3
-#define MMC_NUM_MINORS (256 >> MMC_SHIFT)
+static int max_devices;
+ static DEFINE_MUTEX(block_mutex);
-static DECLARE_BITMAP(dev_use, MMC_NUM_MINORS);
+/* 256 minors, so at most 256 separate devices */
+static DECLARE_BITMAP(dev_use, 256);
/*
* There is one mmc_blk_data per slot.
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the bkl-trivial tree with the mmc tree
2010-09-20 4:58 linux-next: manual merge of the bkl-trivial tree with the mmc tree Stephen Rothwell
@ 2010-09-20 9:15 ` Arnd Bergmann
0 siblings, 0 replies; 2+ messages in thread
From: Arnd Bergmann @ 2010-09-20 9:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Olof Johansson, Chris Ball
On Monday 20 September 2010, Stephen Rothwell wrote:
> Today's linux-next merge of the bkl-trivial tree got a conflict in
> drivers/mmc/card/block.c between commit
> 28280d210bacf6788a5e4b12c5a9430bd50860b4 ("mmc: make number of mmcblk
> minors configurable") from the mmc tree and commit
> 5778067afcfd8b718ffc3744c25fdd194fc886a1 ("block: autoconvert trivial BKL
> users to private mutex") from the bkl-trivial tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good, thanks!
Chris, do you want to take my patch into your tree instead? Or even better
you could figure out if the BKL is actually needed there and remove it
otherwise so we don't need to introduce the mutex here.
Arnd
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-20 9:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-20 4:58 linux-next: manual merge of the bkl-trivial tree with the mmc tree Stephen Rothwell
2010-09-20 9:15 ` Arnd Bergmann
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).