mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alexander Graf <agraf@suse.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: build failure after merge of the final tree (kvm-ppc tree related)
Date: Fri, 27 Apr 2012 15:54:53 +1000	[thread overview]
Message-ID: <20120427155453.dc0b61315798677ceb3b59a2@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1313 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
ppc44x_defconfig) failed like this:

arch/powerpc/kernel/ppc_ksyms.c:194:1: error: redefinition of '__kstrtab_do_IRQ'
arch/powerpc/kernel/ppc_ksyms.c:62:1: note: previous definition of '__kstrtab_do_IRQ' was here

Caused by commit f4601ff93980 ("PPC: Export some interrupt handlers").

I applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 27 Apr 2012 15:52:54 +1000
Subject: [PATCH] KVM/PPC: do not export things twice

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/kernel/ppc_ksyms.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index f6484f2..cace146 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -191,6 +191,8 @@ EXPORT_SYMBOL(__arch_hweight32);
 EXPORT_SYMBOL(__arch_hweight64);
 #endif
 
-EXPORT_SYMBOL_GPL(do_IRQ);
-EXPORT_SYMBOL_GPL(timer_interrupt);
+#ifndef CONFIG_PPC32
+EXPORT_SYMBOL(do_IRQ);
+EXPORT_SYMBOL(timer_interrupt);
+#endif
 EXPORT_SYMBOL_GPL(performance_monitor_exception);
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-04-27  5:59 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-27  5:54 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-04-19  6:35 Stephen Rothwell
2012-04-20  0:10 ` Stephen Rothwell
2012-04-20  1:14   ` Marcelo Tosatti
2012-04-20  3:35     ` 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=20120427155453.dc0b61315798677ceb3b59a2@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=agraf@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /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

all inboxes | Powered by JetHome®