diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-09-05 06:43:30 (GMT) |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-09-05 06:43:30 (GMT) |
| commit | 91c2beb56b3ab5cf91fe04ddaeb69b90a22b5d36 (patch) | |
| tree | 86dbad225295d8a63048da48728381614c10e1a2 /net/sunrpc/netns.h | |
| parent | 83c93e2bdfe33694032cc6d74e956755dd62e551 (diff) | |
| parent | f2110cb961200e5c382e9d0878ded015109b5dd6 (diff) | |
| download | linux-91c2beb56b3ab5cf91fe04ddaeb69b90a22b5d36.tar.xz | |
Merge remote-tracking branch 'agust/next' into next
From Anatolij:
<<
There are cleanups for some mpc5121 specific drivers and DTS files
in preparation to switch mpc5121 clock support to a clock driver
based on common clock framework. Additionally Sebastian fixed the
mpc52xx PIC driver so that it builds when using older gcc versions.
>>
Diffstat (limited to 'net/sunrpc/netns.h')
| -rw-r--r-- | net/sunrpc/netns.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h index 74d948f..779742c 100644 --- a/net/sunrpc/netns.h +++ b/net/sunrpc/netns.h @@ -23,6 +23,7 @@ struct sunrpc_net { struct rpc_clnt *rpcb_local_clnt4; spinlock_t rpcb_clnt_lock; unsigned int rpcb_users; + unsigned int rpcb_is_af_local : 1; struct mutex gssp_lock; wait_queue_head_t gssp_wq; |