From: Ingo Molnar <mingo@elte•hu>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>,
linux-next@vger•kernel.org, Steven Rostedt <srostedt@redhat•com>,
"Luis R. Rodriguez" <lrodriguez@atheros•com>,
"John W. Linville" <linville@tuxdriver•com>,
"David S. Miller" <davem@davemloft•net>
Subject: Re: linux-next: ftrace tree build failure
Date: Tue, 25 Nov 2008 08:28:01 +0100 [thread overview]
Message-ID: <20081125072801.GA15592@elte.hu> (raw)
In-Reply-To: <20081125140719.03a8cdfb.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi all,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> net/wireless/reg.c:348:29: error: macro "if" passed 2 arguments, but takes just 1
> net/wireless/reg.c: In function 'ignore_request':
> net/wireless/reg.c:349: error: expected '(' before 'return'
>
> This is clearly a bug in in the above file and should be fixed there, so
> I have applied the following patch for today. I expect some patch to fix
> this to appear in the wireless-current or net-current tree very soon.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
> diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> index 626dbb6..648c765 100644
> --- a/net/wireless/reg.c
> +++ b/net/wireless/reg.c
> @@ -343,9 +343,7 @@ static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by,
> return 0;
> return -EALREADY;
> }
> - if (WARN_ON(!is_alpha2_set(alpha2) || !is_an_alpha2(alpha2)),
> - "Invalid Country IE regulatory hint passed "
> - "to the wireless core\n")
> + if (WARN_ON(!is_alpha2_set(alpha2) || !is_an_alpha2(alpha2)))
this fix is wrong - the intention of that line was to add a proper
WARN(), not a WARN_ON(). Your change loses the message that WARN()
prints.
i posted a tested fix for this two days ago:
http://marc.info/?l=linux-kernel&m=122745649425646&w=2
see it also below.
Ingo
--------------->
>From de734ba59d249ee785a1ead600e5a6ea1dd62639 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte•hu>
Date: Sun, 23 Nov 2008 20:09:54 +0100
Subject: [PATCH] net/wireless/reg.c: fix
fix:
net/wireless/reg.c:348:29: error: macro "if" passed 2 arguments, but takes just 1
triggered by the branch-tracer.
Signed-off-by: Ingo Molnar <mingo@elte•hu>
# Please enter the commit message for your changes. Lines starting
---
net/wireless/reg.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 626dbb6..eb3b1a9 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -343,9 +343,9 @@ static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by,
return 0;
return -EALREADY;
}
- if (WARN_ON(!is_alpha2_set(alpha2) || !is_an_alpha2(alpha2)),
+ if (WARN(!is_alpha2_set(alpha2) || !is_an_alpha2(alpha2),
"Invalid Country IE regulatory hint passed "
- "to the wireless core\n")
+ "to the wireless core\n"))
return -EINVAL;
/* We ignore Country IE hints for now, as we haven't yet
* added the dot11MultiDomainCapabilityEnabled flag
next prev parent reply other threads:[~2008-11-25 7:28 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-25 3:07 linux-next: ftrace tree build failure Stephen Rothwell
2008-11-25 3:21 ` Steven Rostedt
2008-11-25 7:28 ` Ingo Molnar [this message]
2008-11-25 7:43 ` Stephen Rothwell
2008-11-25 8:04 ` Ingo Molnar
2008-11-25 14:57 ` John W. Linville
2008-11-25 18:46 ` Luis R. Rodriguez
2008-11-26 0:08 ` Stephen Rothwell
2008-11-26 0:14 ` Luis R. Rodriguez
-- strict thread matches above, loose matches on Subject: below --
2009-01-07 0:53 Stephen Rothwell
2009-01-07 9:55 ` Ingo Molnar
2009-01-07 21:20 ` Stephen Rothwell
2009-01-02 9:07 Stephen Rothwell
2009-01-02 9:14 ` Ingo Molnar
2009-01-02 10:22 ` Stephen Rothwell
2009-01-02 11:16 ` Ingo Molnar
2008-11-25 3:21 Stephen Rothwell
2008-11-25 3:48 ` Steven Rostedt
2008-11-25 4:13 ` Stephen Rothwell
2008-11-25 4:31 ` Steven Rostedt
2008-11-25 5:09 ` Stephen Rothwell
2008-11-25 5:44 ` Steven Rostedt
2008-11-25 6:57 ` Stephen Rothwell
2008-11-25 7:14 ` Ingo Molnar
2008-11-25 7:26 ` Stephen Rothwell
2008-11-25 5:24 ` Steven Rostedt
2008-08-25 3:08 Stephen Rothwell
2008-08-25 6:05 ` Ingo Molnar
2008-08-25 6:11 ` Ingo Molnar
2008-08-25 6:31 ` Stephen Rothwell
2008-08-25 3:01 Stephen Rothwell
2008-08-25 6:09 ` Ingo Molnar
2008-08-25 16:42 ` Steven Rostedt
2008-08-25 16:46 ` Steven Rostedt
2008-08-15 2:27 Stephen Rothwell
2008-08-15 7:56 ` Ingo Molnar
2008-08-15 8:29 ` Stephen Rothwell
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=20081125072801.GA15592@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=davem@davemloft$(echo .)net \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=lrodriguez@atheros$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=srostedt@redhat$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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