diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-07-08 17:27:47 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-07-08 17:27:47 +0200 |
commit | 9e7f7f5425e6d1492109a537ee88c99b29580655 (patch) | |
tree | 81f9d68abb5b793aadaf80bd6940af04e3c16eb9 /fs/cifs/cifsglob.h | |
parent | 6daa2ec0b3e3808c55329d12de3c157cf38b17b0 (diff) | |
parent | f80fd3a5fff88a9ace7e8cd11d07cf874a63ea9f (diff) | |
download | linux-9e7f7f5425e6d1492109a537ee88c99b29580655.tar.bz2 |
Merge branch 'x86/mm' into x86/boot, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/cifs/cifsglob.h')
-rw-r--r-- | fs/cifs/cifsglob.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index bba106cdc43c..8f1d8c1e72be 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -1619,6 +1619,7 @@ void cifs_oplock_break(struct work_struct *work); extern const struct slow_work_ops cifs_oplock_break_ops; extern struct workqueue_struct *cifsiod_wq; +extern __u32 cifs_lock_secret; extern mempool_t *cifs_mid_poolp; |