From: Joe Perches <joe@perches.com>
To: Boaz Harrosh <bharrosh@panasas.com>, Jason Baron <jbaron@redhat.com>
Cc: Philip Blundell <philb@gnu.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
netdev@vger.kernel.org, Randy Dunlap <randy.dunlap@oracle.com>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: [PATCH] 3c505: Fix compile breakage
Date: Mon, 31 Oct 2011 23:45:24 +0200 [thread overview]
Message-ID: <1320097524.4399.8.camel@Joe-Laptop> (raw)
In-Reply-To: <4EAF0F34.4070702@panasas.com>
The joys of preprocessor games with c90 named initializers.
commit 07613b0b5ef8
("dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions")
uses a ".filename" named initializer.
When filename is also a #define this fails to compile.
Remove #define filename from 3c505.c
Signed-off-by: Joe Perches <joe@perches.com>
---
On Mon, 2011-10-31 at 14:12 -0700, Boaz Harrosh wrote:
> Doing an "make ARCH=i386 allmodconfig" on linus/master [f362f98] gives me the below
> compilation breakage.
> (Fedora_15_amd64 machine)
> It's probably old news but I thought I'll report it as part of my obligation
> as a Kernel monkey
Thanks Boaz.
Good monkey, <gives peanut>
drivers/net/ethernet/i825xx/3c505.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/i825xx/3c505.c b/drivers/net/ethernet/i825xx/3c505.c
index 40e1a17..ba82a26 100644
--- a/drivers/net/ethernet/i825xx/3c505.c
+++ b/drivers/net/ethernet/i825xx/3c505.c
@@ -126,15 +126,13 @@
*
*********************************************************/
-#define filename __FILE__
-
#define timeout_msg "*** timeout at %s:%s (line %d) ***\n"
#define TIMEOUT_MSG(lineno) \
- pr_notice(timeout_msg, filename, __func__, (lineno))
+ pr_notice(timeout_msg, __FILE__, __func__, (lineno))
#define invalid_pcb_msg "*** invalid pcb length %d at %s:%s (line %d) ***\n"
#define INVALID_PCB_MSG(len) \
- pr_notice(invalid_pcb_msg, (len), filename, __func__, __LINE__)
+ pr_notice(invalid_pcb_msg, (len), __FILE__, __func__, __LINE__)
#define search_msg "%s: Looking for 3c505 adapter at address %#x..."
next prev parent reply other threads:[~2011-10-31 21:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-31 21:12 3c505.c: Does not compile on linus/master [f362f98] Boaz Harrosh
2011-10-31 21:45 ` Joe Perches [this message]
2011-10-31 21:57 ` [PATCH] 3c505: Fix compile breakage David Miller
2011-10-31 22:18 ` Joe Perches
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=1320097524.4399.8.camel@Joe-Laptop \
--to=joe@perches.com \
--cc=bharrosh@panasas.com \
--cc=jbaron@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=philb@gnu.org \
--cc=randy.dunlap@oracle.com \
--cc=sfr@canb.auug.org.au \
/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).