From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Greg KH <greg@kroah.com>, Alexey Dobriyan <adobriyan@gmail.com>
Subject: linux-next: build failure after merge of the net tree
Date: Thu, 9 Jun 2011 14:56:57 +1000 [thread overview]
Message-ID: <20110609145657.96fae0d0.sfr@canb.auug.org.au> (raw)
Hi all,
After merging the net tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
[See summary in patch below.]
[Hmmm, suddenly allmodconfig is building stuff in staging? Ah ha!
Commit fe35a59e16fb ("Staging: remove STAGING_EXCLUDE_BUILD
option") Greg, a bit of warning might have been nice :-( ]
I assume that this is fallout from commit a6b7a407865a ("net: remove
interrupt.h inclusion from netdevice.h").
I added the following patch for today:
>From 520e46c255afa851b33e5c4a2bcf2112ecccbb6f Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 9 Jun 2011 14:19:09 +1000
Subject: [PATCH] net/staging: add needed interrupt.h and hardirq.h includes
Made necessary by commit a6b7a407865a ("net: remove
interrupt.h inclusion from netdevice.h").
Fixes these build errors:
drivers/staging/brcm80211/brcmfmac/dhd_linux.c:1212:3: error: implicit declaration of function 'in_interrupt'
drivers/staging/brcm80211/brcmfmac/dhd_linux.c:1390:4: error: implicit declaration of function 'tasklet_schedule'
drivers/staging/brcm80211/brcmfmac/dhd_linux.c:1988:3: error: implicit declaration of function 'tasklet_init'
drivers/staging/brcm80211/brcmfmac/dhd_linux.c:2288:5: error: implicit declaration of function 'tasklet_kill'
drivers/staging/brcm80211/brcmfmac/dhd_linux.c:232:24: error: field 'tasklet' has incomplete type
drivers/staging/brcm80211/brcmfmac/wl_iw.c:3670:2: error: implicit declaration of function 'in_interrupt'
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:1349:3: error: implicit declaration of function 'free_irq'
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:1352:2: error: implicit declaration of function 'tasklet_kill'
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:1538:4: error: implicit declaration of function 'tasklet_schedule'
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:765:2: error: implicit declaration of function 'tasklet_init'
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:817:2: error: implicit declaration of function 'request_irq'
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:817:31: error: 'IRQF_SHARED' undeclared (first use in this function)
drivers/staging/brcm80211/brcmsmac/wl_mac80211.h:65:24: error: field 'tasklet' has incomplete type
drivers/staging/rtl8187se/ieee80211/ieee80211.h:994:24: error: field 'ps_task' has incomplete type
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c:1790:3: error: implicit declaration of function 'tasklet_schedule'
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c:2590:2: error: implicit declaration of function 'tasklet_init'
drivers/staging/rtl8187se/r8180.h:461:24: error: field 'irq_rx_tasklet' has incomplete type
drivers/staging/rtl8187se/r8180_core.c:2764:2: error: implicit declaration of function 'tasklet_init'
drivers/staging/rtl8187se/r8180_core.c:2954:2: error: implicit declaration of function 'request_irq'
drivers/staging/rtl8187se/r8180_core.c:2954:55: error: 'IRQF_SHARED' undeclared (first use in this function)
drivers/staging/rtl8187se/r8180_core.c:3641:4: error: implicit declaration of function 'free_irq'
drivers/staging/rtl8187se/r8180_core.c:4026:3: error: implicit declaration of function 'tasklet_schedule'
drivers/staging/rtl8192e/ieee80211/ieee80211.h:2000:24: error: field 'ps_task' has incomplete type
drivers/staging/rtl8192e/r8192E.h:909:24: error: field 'irq_rx_tasklet' has incomplete type
drivers/staging/rtl8192e/r8192E.h:910:24: error: field 'irq_tx_tasklet' has incomplete type
drivers/staging/rtl8192e/r8192E.h:911:31: error: field 'irq_prepare_beacon_tasklet' has incomplete type
drivers/staging/rtl8192e/r8192E_core.c:2008:2: error: implicit declaration of function 'tasklet_init'
drivers/staging/rtl8192e/r8192E_core.c:2412:54: error: 'IRQF_SHARED' undeclared (first use in this function)
drivers/staging/rtl8192e/r8192E_core.c:2412:9: error: implicit declaration of function 'request_irq'
drivers/staging/rtl8192e/r8192E_core.c:4640:4: error: implicit declaration of function 'free_irq'
drivers/staging/rtl8192e/r8192E_core.c:620:2: error: implicit declaration of function 'synchronize_irq'
drivers/staging/rtl8192e/r8192E_core.c:913:3: error: implicit declaration of function 'tasklet_schedule'
drivers/staging/rtl8192u/ieee80211/ieee80211.h:1993:24: error: field 'ps_task' has incomplete type
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 ++
drivers/staging/brcm80211/brcmfmac/wl_iw.c | 1 +
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 1 +
drivers/staging/brcm80211/brcmsmac/wl_mac80211.h | 2 ++
drivers/staging/rtl8187se/ieee80211/ieee80211.h | 1 +
.../rtl8187se/ieee80211/ieee80211_softmac.c | 1 +
drivers/staging/rtl8187se/r8180.h | 1 +
drivers/staging/rtl8187se/r8180_core.c | 1 +
drivers/staging/rtl8192e/ieee80211/ieee80211.h | 1 +
drivers/staging/rtl8192e/r8192E.h | 1 +
drivers/staging/rtl8192e/r8192E_core.c | 2 ++
drivers/staging/rtl8192u/ieee80211/ieee80211.h | 1 +
12 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index f356c56..09957bd 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -31,6 +31,8 @@
#include <linux/fcntl.h>
#include <linux/fs.h>
#include <linux/uaccess.h>
+#include <linux/interrupt.h>
+#include <linux/hardirq.h>
#include <bcmdefs.h>
#include <bcmutils.h>
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index 15e1b05..35eec91 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -18,6 +18,7 @@
#include <linux/semaphore.h>
#include <bcmdefs.h>
#include <linux/netdevice.h>
+#include <linux/hardirq.h>
#include <wlioctl.h>
#include <bcmutils.h>
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 6c6236c..8261229 100644
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -24,6 +24,7 @@
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/firmware.h>
+#include <linux/interrupt.h>
#include <net/mac80211.h>
#include <proto/802.11.h>
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h
index e703d8b..f7a58b7 100644
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h
@@ -17,6 +17,8 @@
#ifndef _wl_mac80211_h_
#define _wl_mac80211_h_
+#include <linux/interrupt.h>
+
/* BMAC Note: High-only driver is no longer working in softirq context as it needs to block and
* sleep so perimeter lock has to be a semaphore instead of spinlock. This requires timers to be
* submitted to workqueue instead of being on kernel timer
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211.h b/drivers/staging/rtl8187se/ieee80211/ieee80211.h
index 16aa6a8..4384d93 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h
@@ -32,6 +32,7 @@
#include <linux/semaphore.h>
#include <linux/wireless.h>
#include <linux/ieee80211.h>
+#include <linux/interrupt.h>
#define KEY_TYPE_NA 0x0
#define KEY_TYPE_WEP40 0x1
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index 736a140..00ee02f 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
@@ -20,6 +20,7 @@
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/version.h>
+#include <linux/interrupt.h>
#include <asm/uaccess.h>
#include "dot11d.h"
diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h
index d15bdf6..a2c46ae 100644
--- a/drivers/staging/rtl8187se/r8180.h
+++ b/drivers/staging/rtl8187se/r8180.h
@@ -18,6 +18,7 @@
#ifndef R8180H
#define R8180H
+#include <linux/interrupt.h>
#define RTL8180_MODULE_NAME "r8180"
#define DMESG(x,a...) printk(KERN_INFO RTL8180_MODULE_NAME ": " x "\n", ## a)
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 2155a77..bae7d85 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -33,6 +33,7 @@
#include <linux/slab.h>
#include <linux/syscalls.h>
#include <linux/eeprom_93cx6.h>
+#include <linux/interrupt.h>
#include "r8180_hw.h"
#include "r8180.h"
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211.h b/drivers/staging/rtl8192e/ieee80211/ieee80211.h
index dbe21ab..82bc59a 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h
@@ -31,6 +31,7 @@
#include <linux/timer.h>
#include <linux/sched.h>
#include <linux/semaphore.h>
+#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/wireless.h>
diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h
index 0229031..89fe8fc 100644
--- a/drivers/staging/rtl8192e/r8192E.h
+++ b/drivers/staging/rtl8192e/r8192E.h
@@ -36,6 +36,7 @@
#include <linux/if_arp.h>
#include <linux/random.h>
#include <linux/version.h>
+#include <linux/interrupt.h>
#include <asm/io.h>
#include "ieee80211/rtl819x_HT.h"
#include "ieee80211/ieee80211.h"
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 58d800f..19a9a07 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -27,6 +27,8 @@
#include <linux/vmalloc.h>
#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/hardirq.h>
#include <asm/uaccess.h>
#include "r8192E_hw.h"
#include "r8192E.h"
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index e716f7b..2333257 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -31,6 +31,7 @@
#include <linux/timer.h>
#include <linux/sched.h>
#include <linux/semaphore.h>
+#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/wireless.h>
--
1.7.5.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2011-06-09 4:56 UTC|newest]
Thread overview: 134+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-09 4:56 Stephen Rothwell [this message]
2011-06-09 5:17 ` linux-next: build failure after merge of the net tree Greg K-H
2011-06-09 5:39 ` Stephen Rothwell
2011-06-09 19:29 ` Greg KH
2011-06-10 20:28 ` Geert Uytterhoeven
2011-06-11 4:26 ` Stephen Rothwell
2011-06-11 11:39 ` Geert Uytterhoeven
2011-06-14 22:56 ` Stephen Rothwell
2011-06-20 4:58 ` Stephen Rothwell
2011-06-20 5:36 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2024-04-10 22:42 Stephen Rothwell
2023-05-17 23:06 Stephen Rothwell
2023-05-17 23:29 ` Stephen Rothwell
2023-05-18 4:42 ` Jakub Kicinski
2023-05-18 6:47 ` Paolo Abeni
2023-05-18 6:52 ` Dario Binacchi
2023-05-18 7:14 ` Paolo Abeni
2023-05-18 9:37 ` Marc Kleine-Budde
2021-07-06 23:11 Stephen Rothwell
2021-07-08 4:01 ` Stephen Rothwell
2018-11-15 6:02 Stephen Rothwell
2017-06-08 0:08 Stephen Rothwell
2017-06-08 0:17 ` David Miller
2017-06-08 7:22 ` Greg Kroah-Hartman
2017-06-08 9:00 ` Stephen Rothwell
2017-02-13 22:12 Stephen Rothwell
2017-02-13 23:31 ` Alexei Starovoitov
2017-02-14 7:59 ` Joe Stringer
2017-02-14 6:35 ` Ingo Molnar
2017-02-14 6:42 ` Ingo Molnar
2017-02-14 9:19 ` Jiri Olsa
2017-02-14 12:50 ` Arnaldo Carvalho de Melo
2017-02-14 13:23 ` Jiri Olsa
2017-02-14 13:54 ` Arnaldo Carvalho de Melo
2017-02-16 3:02 ` Stephen Rothwell
2017-02-16 3:06 ` Alexei Starovoitov
2017-02-16 3:27 ` David Miller
2017-02-16 3:30 ` Alexei Starovoitov
2017-02-16 3:42 ` Stephen Rothwell
2016-10-20 22:27 Stephen Rothwell
2016-10-20 22:42 ` Florian Fainelli
2016-10-21 0:30 ` Florian Fainelli
2016-10-21 0:43 ` Stephen Rothwell
2016-10-21 0:46 ` Florian Fainelli
2014-10-14 23:44 Stephen Rothwell
2014-10-15 2:02 ` David Miller
2014-10-15 5:24 ` Giuseppe CAVALLARO
2014-09-17 1:04 Stephen Rothwell
2014-09-17 1:12 ` Stephen Rothwell
2014-09-17 1:48 ` David Miller
2014-09-17 2:18 ` Stephen Rothwell
2014-09-16 0:24 Stephen Rothwell
2014-08-26 2:05 Stephen Rothwell
2014-08-26 3:22 ` David Miller
2014-08-26 3:33 ` Stephen Rothwell
2014-07-30 0:36 Stephen Rothwell
2014-07-30 8:26 ` Oliver Neukum
2014-07-04 1:39 Stephen Rothwell
2014-07-08 2:53 ` David Miller
2014-07-08 16:28 ` Florian Fainelli
2014-07-23 18:38 ` Vince Bridgers
2014-07-23 18:40 ` Florian Fainelli
2014-07-23 18:42 ` Vince Bridgers
2014-05-20 0:59 Stephen Rothwell
2014-05-20 14:50 ` Vlad Yasevich
2012-10-04 0:18 Stephen Rothwell
2012-10-04 0:50 ` David Miller
2012-10-04 1:06 ` Stephen Rothwell
2012-10-04 1:47 ` David Miller
2012-10-04 2:12 ` Jay Hernandez
2011-08-16 3:26 Stephen Rothwell
2011-08-16 4:03 ` David Miller
2011-08-12 2:02 Stephen Rothwell
2011-08-12 2:31 ` Jeff Kirsher
2011-08-12 2:51 ` David Miller
2011-08-12 3:05 ` Jeff Kirsher
2011-08-12 4:34 ` Stephen Rothwell
2011-08-12 5:22 ` Jeff Kirsher
2011-04-26 3:51 Stephen Rothwell
2011-04-26 19:43 ` David Miller
2011-04-13 2:03 Stephen Rothwell
2011-04-13 2:28 ` David Miller
2011-04-04 1:28 Stephen Rothwell
2011-04-04 2:43 ` David Miller
2011-03-14 4:24 Stephen Rothwell
2011-03-14 4:59 ` Ben Hutchings
2011-03-14 5:31 ` Stephen Rothwell
2011-03-14 5:53 ` David Miller
2011-03-14 6:05 ` Stephen Rothwell
2011-03-14 6:18 ` David Miller
2011-03-14 9:44 ` Thomas Gleixner
2011-03-14 9:56 ` Thomas Gleixner
2011-03-15 0:30 ` Stephen Rothwell
2011-03-15 4:07 ` David Miller
2011-03-15 6:25 ` Stephen Rothwell
2011-03-15 10:29 ` Thomas Gleixner
2011-03-15 22:07 ` David Miller
2011-03-09 2:42 Stephen Rothwell
2011-03-09 6:45 ` David Miller
2011-01-21 1:05 Stephen Rothwell
2011-01-21 1:10 ` David Miller
2010-12-09 2:28 Stephen Rothwell
2010-12-09 2:39 ` David Miller
2010-12-09 3:02 ` Stephen Rothwell
2010-12-07 1:00 Stephen Rothwell
2010-12-07 4:46 ` David Miller
2010-12-07 4:57 ` Joe Perches
2010-12-07 18:34 ` Breno Leitao
2010-11-29 0:08 Stephen Rothwell
2010-11-29 2:11 ` David Miller
2010-11-29 7:25 ` Peppe CAVALLARO
2010-11-16 0:34 Stephen Rothwell
2010-11-16 4:15 ` David Miller
2010-10-15 0:38 Stephen Rothwell
2010-10-14 22:07 ` Jeff Kirsher
2010-08-27 1:14 Stephen Rothwell
2010-08-27 3:32 ` David Miller
2010-06-15 2:00 Stephen Rothwell
2010-06-15 2:13 ` David Miller
2010-06-15 3:42 ` Stephen Rothwell
2010-05-03 2:08 Stephen Rothwell
2010-05-03 2:37 ` David Miller
2010-05-03 4:44 ` Stephen Rothwell
2010-04-07 2:58 Stephen Rothwell
2010-04-07 3:12 ` David Miller
2010-04-07 5:28 ` Stephen Rothwell
2010-02-15 4:20 Stephen Rothwell
2010-02-15 6:22 ` David Miller
2010-02-08 2:22 Stephen Rothwell
2010-02-08 3:40 ` David Miller
2010-02-08 3:58 ` Stephen Rothwell
2010-02-05 5:50 Stephen Rothwell
2010-02-05 6:32 ` David Miller
2010-02-05 11:49 ` 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=20110609145657.96fae0d0.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=adobriyan@gmail.com \
--cc=davem@davemloft.net \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@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;
as well as URLs for NNTP newsgroup(s).