Hi all,
After merging the char-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from drivers/misc/mei/hw-txe.c:25:0:
drivers/misc/mei/hw-txe.h:63:1: error: unknown type name 'irqreturn_t'
irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id);
^
drivers/misc/mei/hw-txe.h:64:1: error: unknown type name 'irqreturn_t'
irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id);
^
drivers/misc/mei/hw-txe.c:879:1: error: unknown type name 'irqreturn_t'
irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id)
^
drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_quick_handler':
drivers/misc/mei/hw-txe.c:884:10: error: 'IRQ_WAKE_THREAD' undeclared (first use in this function)
return IRQ_WAKE_THREAD;
^
drivers/misc/mei/hw-txe.c:884:10: note: each undeclared identifier is reported only once for each function it appears in
drivers/misc/mei/hw-txe.c:885:9: error: 'IRQ_NONE' undeclared (first use in this function)
return IRQ_NONE;
^
drivers/misc/mei/hw-txe.c: At top level:
drivers/misc/mei/hw-txe.c:898:1: error: unknown type name 'irqreturn_t'
irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id)
^
drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_thread_handler':
drivers/misc/mei/hw-txe.c:1007:9: error: 'IRQ_HANDLED' undeclared (first use in this function)
return IRQ_HANDLED;
^
drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_quick_handler':
drivers/misc/mei/hw-txe.c:886:1: warning: control reaches end of non-void function [-Wreturn-type]
}
^
drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_thread_handler':
drivers/misc/mei/hw-txe.c:1008:1: warning: control reaches end of non-void function [-Wreturn-type]
}
^
Caused by commit 266f6178d1f1 ("mei: txe: add hw-txe.h header file") but
probably exposed by commit 46cb7b1bd86f ("PCI: Remove unused SR-IOV VF
Migration support") from the pci tree which removed the include of
irqreturn.h from pci.h ...
See Rule 1 from Documentation/SubmitChecklist ...
I added the following merge fix patch (this should be applied to the
char-misc tree):
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 21 Feb 2014 16:38:28 +1100
Subject: [PATCH] mei: txe: include irqreturn.h for irqreturn_t etc
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/misc/mei/hw-txe.c | 1 +
drivers/misc/mei/hw-txe.h | 2 ++
2 files changed, 3 insertions(+)
diff --git a/drivers/misc/mei/hw-txe.c b/drivers/misc/mei/hw-txe.c
index 19579e560dad..49a5ed376969 100644
--- a/drivers/misc/mei/hw-txe.c
+++ b/drivers/misc/mei/hw-txe.c
@@ -18,6 +18,7 @@
#include <linux/jiffies.h>
#include <linux/delay.h>
#include <linux/kthread.h>
+#include <linux/irqreturn.h>
#include <linux/mei.h>
diff --git a/drivers/misc/mei/hw-txe.h b/drivers/misc/mei/hw-txe.h
index 857d88ccef61..fdb665f44d5d 100644
--- a/drivers/misc/mei/hw-txe.h
+++ b/drivers/misc/mei/hw-txe.h
@@ -17,6 +17,8 @@
#ifndef _MEI_HW_TXE_H_
#define _MEI_HW_TXE_H_
+#include <linux/irqreturn.h>
+
#include "hw.h"
#include "hw-txe-regs.h"
--
1.9.0
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpdGbQ1qlZKY.pgp
Description: PGP signature
