From: Stephen Rothwell <hidden> Date: 2011-03-14 04:25:11
Hi all,
After merging the net tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
kernel/irq/manage.c: In function 'irq_affinity_notify':
kernel/irq/manage.c:182: error: 'struct irq_desc' has no member named 'affinity'
Caused by commit cd7eab44e994 ("genirq: Add IRQ affinity notifiers")
(which is also in the tip tree). I am guessing that there is a fix for
this also in the tip tree ... yep commit 1fb0ef31f428 ("genirq: Fix
affinity notifier fallout").
I tried using the net tree from next-20110311 for today but that had the
same problem. So I merged the above fix commit from the tip tree.
I have no idea why this has suddenly become a problem in the net tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Ben Hutchings <hidden> Date: 2011-03-14 04:59:47
On Mon, 2011-03-14 at 15:24 +1100, Stephen Rothwell wrote:
Hi all,
After merging the net tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
kernel/irq/manage.c: In function 'irq_affinity_notify':
kernel/irq/manage.c:182: error: 'struct irq_desc' has no member named 'affinity'
Caused by commit cd7eab44e994 ("genirq: Add IRQ affinity notifiers")
(which is also in the tip tree). I am guessing that there is a fix for
this also in the tip tree ... yep commit 1fb0ef31f428 ("genirq: Fix
affinity notifier fallout").
I tried using the net tree from next-20110311 for today but that had the
same problem. So I merged the above fix commit from the tip tree.
I have no idea why this has suddenly become a problem in the net tree.
Commit cd7eab44e994 ("genirq: Add IRQ affinity notifiers") was a
prerequisite for some changes in networking. Thomas Gleixner applied it
on a branch of its own so that David Miller could pull just that commit
into net-next-2.6. Of course, this means net-next-2.6 doesn't have the
later fix (and won't for a while).
Ben.
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
From: Stephen Rothwell <hidden> Date: 2011-03-14 05:31:45
Hi Ben,
On Mon, 14 Mar 2011 04:59:38 +0000 Ben Hutchings [off-list ref] wrote:
Commit cd7eab44e994 ("genirq: Add IRQ affinity notifiers") was a
prerequisite for some changes in networking. Thomas Gleixner applied it
on a branch of its own so that David Miller could pull just that commit
into net-next-2.6. Of course, this means net-next-2.6 doesn't have the
later fix (and won't for a while).
Yeah, but Dave merged that into the net-next-2.6 tree some time ago
(late January) and it hasn't caused a problem in my builds until now.
Maybe some config option changed ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell <hidden> Date: 2011-03-14 06:06:04
Hi Dave,
On Sun, 13 Mar 2011 22:53:12 -0700 (PDT) David Miller [off-list ref] wrote:
From: Stephen Rothwell <redacted>
Date: Mon, 14 Mar 2011 16:31:35 +1100
quoted
Maybe some config option changed ...
Perhaps GENERIC_HARDIRQS_NO_DEPRECATED?
Yep, that has been turned on for powerpc now. I guess you will have the
same problem on sparc64 of you merge the net-next and sparc trees ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Thomas Gleixner <hidden> Date: 2011-03-14 09:56:37
On Mon, 14 Mar 2011, Stephen Rothwell wrote:
Hi Dave,
On Sun, 13 Mar 2011 22:53:12 -0700 (PDT) David Miller [off-list ref] wrote:
quoted
From: Stephen Rothwell <redacted>
Date: Mon, 14 Mar 2011 16:31:35 +1100
quoted
Maybe some config option changed ...
Perhaps GENERIC_HARDIRQS_NO_DEPRECATED?
Yep, that has been turned on for powerpc now. I guess you will have the
same problem on sparc64 of you merge the net-next and sparc trees ...
Yeah, powerpc alone compiles with GENERIC_HARDIRQS_NO_DEPRECATED as it
does not have that notify commit.
If you add net which has that notify commit, but not the fix it
breaks. I wonder whether Dave should pick that fix into net.
Thanks,
tglx
From: Stephen Rothwell <hidden> Date: 2011-03-15 00:30:59
Hi Dave,
On Mon, 14 Mar 2011 10:56:12 +0100 (CET) Thomas Gleixner [off-list ref] wrote:
On Mon, 14 Mar 2011, Stephen Rothwell wrote:
quoted
On Sun, 13 Mar 2011 22:53:12 -0700 (PDT) David Miller [off-list ref] wrote:
quoted
From: Stephen Rothwell <redacted>
Date: Mon, 14 Mar 2011 16:31:35 +1100
quoted
Maybe some config option changed ...
Perhaps GENERIC_HARDIRQS_NO_DEPRECATED?
Yep, that has been turned on for powerpc now. I guess you will have the
same problem on sparc64 of you merge the net-next and sparc trees ...
Yeah, powerpc alone compiles with GENERIC_HARDIRQS_NO_DEPRECATED as it
does not have that notify commit.
If you add net which has that notify commit, but not the fix it
breaks. I wonder whether Dave should pick that fix into net.
So, if you merge the commit 1fb0ef31f428 ("genirq: Fix affinity notifier
fallout") from the tip tree, you will get exactly one new commit and will
fix your tree properly with no adverse effect on anyone else.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: David Miller <davem@davemloft.net> Date: 2011-03-15 04:06:36
From: Stephen Rothwell <redacted>
Date: Tue, 15 Mar 2011 11:30:49 +1100
On Mon, 14 Mar 2011 10:56:12 +0100 (CET) Thomas Gleixner [off-list ref] wrote:
quoted
Yeah, powerpc alone compiles with GENERIC_HARDIRQS_NO_DEPRECATED as it
does not have that notify commit.
If you add net which has that notify commit, but not the fix it
breaks. I wonder whether Dave should pick that fix into net.
So, if you merge the commit 1fb0ef31f428 ("genirq: Fix affinity notifier
fallout") from the tip tree, you will get exactly one new commit and will
fix your tree properly with no adverse effect on anyone else.
Thomas, how would you like me to do this? Do you want to put that
commit on a branch for me to pull from or should I apply it
directly?
From: Stephen Rothwell <hidden> Date: 2011-03-15 06:26:13
Hi Dave,
On Mon, 14 Mar 2011 21:07:12 -0700 (PDT) David Miller [off-list ref] wrote:
From: Stephen Rothwell <redacted>
Date: Tue, 15 Mar 2011 11:30:49 +1100
quoted
So, if you merge the commit 1fb0ef31f428 ("genirq: Fix affinity notifier
fallout") from the tip tree, you will get exactly one new commit and will
fix your tree properly with no adverse effect on anyone else.
Thomas, how would you like me to do this? Do you want to put that
commit on a branch for me to pull from or should I apply it
directly?
That commit is already the head of the irq/numa branch in the tip tree
(it is also on the irq/core branch).
Please merge that rather than cherry-picking the commit as that will
minimise the possibility of conflicts. Pulling the irq/numa branch will
get you just that one fixup commit (as you have already merged up to the
immediately preceding commit).
I assume this makes sense, Thomas? I just did a merge of the actual
fixup commit after merging the net tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Thomas Gleixner <hidden> Date: 2011-03-15 10:30:17
On Tue, 15 Mar 2011, Stephen Rothwell wrote:
Hi Dave,
On Mon, 14 Mar 2011 21:07:12 -0700 (PDT) David Miller [off-list ref] wrote:
quoted
From: Stephen Rothwell <redacted>
Date: Tue, 15 Mar 2011 11:30:49 +1100
quoted
So, if you merge the commit 1fb0ef31f428 ("genirq: Fix affinity notifier
fallout") from the tip tree, you will get exactly one new commit and will
fix your tree properly with no adverse effect on anyone else.
Thomas, how would you like me to do this? Do you want to put that
commit on a branch for me to pull from or should I apply it
directly?
That commit is already the head of the irq/numa branch in the tip tree
(it is also on the irq/core branch).
Please merge that rather than cherry-picking the commit as that will
minimise the possibility of conflicts. Pulling the irq/numa branch will
get you just that one fixup commit (as you have already merged up to the
immediately preceding commit).
I assume this makes sense, Thomas? I just did a merge of the actual
fixup commit after merging the net tree.
From: David Miller <davem@davemloft.net> Date: 2011-03-15 22:06:40
From: Thomas Gleixner <redacted>
Date: Tue, 15 Mar 2011 11:29:18 +0100 (CET)
On Tue, 15 Mar 2011, Stephen Rothwell wrote:
quoted
Hi Dave,
On Mon, 14 Mar 2011 21:07:12 -0700 (PDT) David Miller [off-list ref] wrote:
quoted
From: Stephen Rothwell <redacted>
Date: Tue, 15 Mar 2011 11:30:49 +1100
quoted
So, if you merge the commit 1fb0ef31f428 ("genirq: Fix affinity notifier
fallout") from the tip tree, you will get exactly one new commit and will
fix your tree properly with no adverse effect on anyone else.
Thomas, how would you like me to do this? Do you want to put that
commit on a branch for me to pull from or should I apply it
directly?
That commit is already the head of the irq/numa branch in the tip tree
(it is also on the irq/core branch).
Please merge that rather than cherry-picking the commit as that will
minimise the possibility of conflicts. Pulling the irq/numa branch will
get you just that one fixup commit (as you have already merged up to the
immediately preceding commit).
I assume this makes sense, Thomas? I just did a merge of the actual
fixup commit after merging the net tree.