diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-03-23 07:35:15 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-03-23 07:35:15 +0100 |
commit | 4ccb6aea4b3eb97c94575d1ed4bf10744169f082 (patch) | |
tree | a2ca8bc8b567608bd4067593b752f78c895d713b /fs/nfsd/nfssvc.c | |
parent | f25d384755191690b1196776d319cb6a4e899f28 (diff) | |
parent | 093b995e3b55a0ae0670226ddfcb05bfbf0099ae (diff) |
Merge branch 'linus' into x86/asm, to refresh the topic tree with fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/nfsd/nfssvc.c')
-rw-r--r-- | fs/nfsd/nfssvc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index efd66da99201..786a4a2cb2d7 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -6,7 +6,7 @@ * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de> */ -#include <linux/sched.h> +#include <linux/sched/signal.h> #include <linux/freezer.h> #include <linux/module.h> #include <linux/fs_struct.h> |