The patch titled
Subject: memstick: ms_block: fix complile issue
has been added to the -mm tree. Its filename is
memstick-ms_block-fix-complile-issue.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
Subject: memstick: ms_block: fix complile issue
As suggested by Geert Uytterhoeven:
: http://kisskb.ellerman.id.au/kisskb/buildresult/7280352/
: arch/m68k/include/asm/hardirq.h:23:20: error: expected ')' before 'DRIVER_NAME'
: make[4]: *** [drivers/memstick/core/ms_block.o] Error 1
:
: The reason for this is that pr_fmt() references DRIVER_NAME and is defined
: before the first include, while DRIVER_NAME is only defined in ms_block.h,
: which is the last included file. If any subsequent include file uses
: pr_fmt() (e.g. the call to pr_crit() in arch/m68k/include/asm/hardirq.h),
: this causes a build failure.
:
: I suggest moving the DRIVER_NAME define to ms_block.c. Cfr. memstick.c
: and mspro_block.c, who already have their own definition.
Signed-off-by: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Alex Dubov <oakad@xxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/memstick/core/ms_block.c | 2 +-
drivers/memstick/core/ms_block.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff -puN drivers/memstick/core/ms_block.c~memstick-ms_block-fix-complile-issue drivers/memstick/core/ms_block.c
--- a/drivers/memstick/core/ms_block.c~memstick-ms_block-fix-complile-issue
+++ a/drivers/memstick/core/ms_block.c
@@ -11,7 +11,7 @@
* Copyright (C) 2007 Alex Dubov <oakad@xxxxxxxxx>
*
*/
-
+#define DRIVER_NAME "ms_block"
#define pr_fmt(fmt) DRIVER_NAME ": " fmt
#include <linux/module.h>
diff -puN drivers/memstick/core/ms_block.h~memstick-ms_block-fix-complile-issue drivers/memstick/core/ms_block.h
--- a/drivers/memstick/core/ms_block.h~memstick-ms_block-fix-complile-issue
+++ a/drivers/memstick/core/ms_block.h
@@ -277,8 +277,6 @@ static int msb_reset(struct msb_data *ms
static int h_msb_default_bad(struct memstick_dev *card,
struct memstick_request **mrq);
-#define DRIVER_NAME "ms_block"
-
#define __dbg(level, format, ...) \
do { \
if (debug >= level) \
_
Patches currently in -mm which might be from maximlevitsky@xxxxxxxxx are
origin.patch
linux-next.patch
memstick-remove-unused-field-from-state-struct.patch
memstick-ms_block-fix-complile-issue.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
