2014-02-14 07:21:10

by Mike Galbraith

Subject: [patch] net,bonding: fix bond_options.c direct rwlock.h include

drivers/net/bonding/bond_options.c includes rwlock.h directly,
which is a nono, and which also breaks RT kernel build.

Signed-off-by: Mike Galbraith <[email protected]>
---
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 11cb943222d5..c37878432717 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -14,7 +14,7 @@
#include <linux/errno.h>
#include <linux/if.h>
#include <linux/netdevice.h>
-#include <linux/rwlock.h>
+#include <linux/spinlock.h>
#include <linux/rcupdate.h>
#include <linux/ctype.h>
#include <linux/inet.h>

2014-02-14 21:21:06

by David Miller

Subject: Re: [patch] net,bonding: fix bond_options.c direct rwlock.h include

From: Mike Galbraith <[email protected]>
Date: Fri, 14 Feb 2014 08:21:04 +0100

> drivers/net/bonding/bond_options.c includes rwlock.h directly,
> which is a nono, and which also breaks RT kernel build.
>
> Signed-off-by: Mike Galbraith <[email protected]>

Applied, thank you.