public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rich Felker <dalias@libc•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: build failure after merge of the sh tree
Date: Sun, 24 Jul 2016 17:55:01 +1000	[thread overview]
Message-ID: <20160724175501.7a46e24f@canb.auug.org.au> (raw)

Hi Rich,

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

drivers/clocksource/jcore-pit.c:145:20: error: conflicting types for 'timer_interrupt'
 static irqreturn_t timer_interrupt(int irq, void *dev_id)
                    ^
In file included from arch/powerpc/include/asm/irqflags.h:11:0,
                 from include/linux/irqflags.h:15,
                 from include/linux/spinlock.h:53,
                 from include/linux/mmzone.h:7,
                 from include/linux/gfp.h:5,
                 from include/linux/slab.h:14,
                 from drivers/clocksource/jcore-pit.c:12:
arch/powerpc/include/asm/hw_irq.h:36:13: note: previous declaration of 'timer_interrupt' was here
 extern void timer_interrupt(struct pt_regs *);
             ^

Caused by commit

  e0aa0655c60b ("clocksource: add J-Core timer/clocksource driver")

I added this fix patch:

From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Sun, 24 Jul 2016 17:42:19 +1000
Subject: [PATCH] clocksource: make J-Core timer_interrupt more unique

Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
 drivers/clocksource/jcore-pit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/jcore-pit.c b/drivers/clocksource/jcore-pit.c
index b9d693bcb41e..373b9f954a5c 100644
--- a/drivers/clocksource/jcore-pit.c
+++ b/drivers/clocksource/jcore-pit.c
@@ -142,7 +142,7 @@ static int jcore_pit_cpu_notify(struct notifier_block *self,
 	return NOTIFY_OK;
 }
 
-static irqreturn_t timer_interrupt(int irq, void *dev_id)
+static irqreturn_t jcore_timer_interrupt(int irq, void *dev_id)
 {
 	struct jcore_pit *pit = this_cpu_ptr(dev_id);
 
@@ -224,7 +224,7 @@ static void __init jcore_pit_init(struct device_node *node)
 		goto out;
 	}
 
-	err = request_irq(pit_irq, timer_interrupt,
+	err = request_irq(pit_irq, jcore_timer_interrupt,
 		IRQF_TIMER | IRQF_PERCPU, "jcore_pit", pit_percpu);
 	if (err) {
 		pr_err("pit irq request failed: %d\n", err);
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell

             reply	other threads:[~2016-07-24  7:55 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-24  7:55 Stephen Rothwell [this message]
2016-07-25  3:57 ` linux-next: build failure after merge of the sh tree Rich Felker
2016-07-25  4:18   ` 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=20160724175501.7a46e24f@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=dalias@libc$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    /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