diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-06 03:57:03 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-06 04:19:22 +0300 |
| commit | 53954cf8c5d205624167a2bfd117cc0c1a5f3c6d (patch) | |
| tree | a287f0c80eb616758bb5212523c8fb3d8fc350a4 /drivers/net/ppp/ppp_generic.c | |
| parent | 4b54db1375757aa3e870c075065a8ab9350d26c4 (diff) | |
| parent | 7a92616c0bac849e790283723b36c399668a1d9f (diff) | |
| download | linux-53954cf8c5d205624167a2bfd117cc0c1a5f3c6d.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ppp/ppp_generic.c')
| -rw-r--r-- | drivers/net/ppp/ppp_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index a404552555d4..c3f77e3b7819 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -120,7 +120,7 @@ struct ppp { int n_channels; /* how many channels are attached 54 */ spinlock_t rlock; /* lock for receive side 58 */ spinlock_t wlock; /* lock for transmit side 5c */ - int *xmit_recursion __percpu; /* xmit recursion detect */ + int __percpu *xmit_recursion; /* xmit recursion detect */ int mru; /* max receive unit 60 */ unsigned int flags; /* control bits 64 */ unsigned int xstate; /* transmit state bits 68 */ |