| Message ID | 1416428298-10000-1-git-send-email-johannes@sipsolutions.net (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 11/19/14 21:18, Johannes Berg wrote: > From: Johannes Berg<johannes.berg@intel.com> > > This is a specific implementation,<asm/unaligned.h> is the > multiplexer that has the arch-specific knowledge of which > of the implementations needs to be used, so include that. Thanks, Johannes Maybe it would be good to mention this was found by kbuild test robot. Acked-by: Arend van Spriel <arend@broadcom.com> > Signed-off-by: Johannes Berg<johannes.berg@intel.com> > --- > drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c > index b0ae7993e2e8..138691a1365a 100644 > --- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c > +++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c > @@ -19,10 +19,10 @@ > #include<linux/pci.h> > #include<linux/vmalloc.h> > #include<linux/delay.h> > -#include<linux/unaligned/access_ok.h> > #include<linux/interrupt.h> > #include<linux/bcma/bcma.h> > #include<linux/sched.h> > +#include<asm/unaligned.h> > > #include<soc.h> > #include<chipcommon.h> -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2014-11-19 at 21:36 +0100, Arend van Spriel wrote: > On 11/19/14 21:18, Johannes Berg wrote: > > From: Johannes Berg<johannes.berg@intel.com> > > > > This is a specific implementation,<asm/unaligned.h> is the > > multiplexer that has the arch-specific knowledge of which > > of the implementations needs to be used, so include that. > > Thanks, Johannes > > Maybe it would be good to mention this was found by kbuild test robot. Yeah, maybe. It was more or less by accident though :-) John, in case I forget - I shouldn't send a mac80211-next pull request before you merge this. johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/19/14 21:42, Johannes Berg wrote: > On Wed, 2014-11-19 at 21:36 +0100, Arend van Spriel wrote: >> On 11/19/14 21:18, Johannes Berg wrote: >>> From: Johannes Berg<johannes.berg@intel.com> >>> >>> This is a specific implementation,<asm/unaligned.h> is the >>> multiplexer that has the arch-specific knowledge of which >>> of the implementations needs to be used, so include that. >> >> Thanks, Johannes >> >> Maybe it would be good to mention this was found by kbuild test robot. > > Yeah, maybe. It was more or less by accident though :-) accidents happen. The pcie stuff was added in 3.17 so my question to John is whether this can go into 3.18 and stable. Regards, Arend > John, in case I forget - I shouldn't send a mac80211-next pull request > before you merge this. > > johannes > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2014-11-19 at 21:47 +0100, Arend van Spriel wrote: > On 11/19/14 21:42, Johannes Berg wrote: > > On Wed, 2014-11-19 at 21:36 +0100, Arend van Spriel wrote: > >> On 11/19/14 21:18, Johannes Berg wrote: > >>> From: Johannes Berg<johannes.berg@intel.com> > >>> > >>> This is a specific implementation,<asm/unaligned.h> is the > >>> multiplexer that has the arch-specific knowledge of which > >>> of the implementations needs to be used, so include that. > >> > >> Thanks, Johannes > >> > >> Maybe it would be good to mention this was found by kbuild test robot. > > > > Yeah, maybe. It was more or less by accident though :-) > > accidents happen. The pcie stuff was added in 3.17 so my question to > John is whether this can go into 3.18 and stable. Could be considered, I guess you can resend the patch with appropriate tags? I just want wireless-next to not complain about my patch ;-) johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/19/14 21:48, Johannes Berg wrote: > On Wed, 2014-11-19 at 21:47 +0100, Arend van Spriel wrote: >> On 11/19/14 21:42, Johannes Berg wrote: >>> On Wed, 2014-11-19 at 21:36 +0100, Arend van Spriel wrote: >>>> On 11/19/14 21:18, Johannes Berg wrote: >>>>> From: Johannes Berg<johannes.berg@intel.com> >>>>> >>>>> This is a specific implementation,<asm/unaligned.h> is the >>>>> multiplexer that has the arch-specific knowledge of which >>>>> of the implementations needs to be used, so include that. >>>> >>>> Thanks, Johannes >>>> >>>> Maybe it would be good to mention this was found by kbuild test robot. >>> >>> Yeah, maybe. It was more or less by accident though :-) >> >> accidents happen. The pcie stuff was added in 3.17 so my question to >> John is whether this can go into 3.18 and stable. > > Could be considered, I guess you can resend the patch with appropriate > tags? I just want wireless-next to not complain about my patch ;-) Yeah, I also hate it when that happens. I will resend it. Regards, Arend > johannes > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c index b0ae7993e2e8..138691a1365a 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c @@ -19,10 +19,10 @@ #include <linux/pci.h> #include <linux/vmalloc.h> #include <linux/delay.h> -#include <linux/unaligned/access_ok.h> #include <linux/interrupt.h> #include <linux/bcma/bcma.h> #include <linux/sched.h> +#include <asm/unaligned.h> #include <soc.h> #include <chipcommon.h>