diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-23 11:12:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-23 11:12:44 +0200 |
| commit | 58d30c36d472b75e8e9962d6a640be19d9389128 (patch) | |
| tree | ce161b15e844d081f527f02a4f74ffd1171b2b14 /net/llc/af_llc.c | |
| parent | Merge tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | Merge branches 'doc.2017.04.12a', 'fixes.2017.04.19a' and 'srcu.2017.04.21a' ... (diff) | |
| download | linux-58d30c36d472b75e8e9962d6a640be19d9389128.tar.xz linux-58d30c36d472b75e8e9962d6a640be19d9389128.zip | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney:
- Documentation updates.
- Miscellaneous fixes.
- Parallelize SRCU callback handling (plus overlapping patches).
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/llc/af_llc.c')
| -rw-r--r-- | net/llc/af_llc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index cb4fff785cbf..8364fe5b59e4 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -142,7 +142,7 @@ static struct proto llc_proto = { .name = "LLC", .owner = THIS_MODULE, .obj_size = sizeof(struct llc_sock), - .slab_flags = SLAB_DESTROY_BY_RCU, + .slab_flags = SLAB_TYPESAFE_BY_RCU, }; /** |