diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2017-04-06 19:35:03 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-06 19:35:03 -0400 |
| commit | fccfb9950836524d79260448fba6131f6b1d73c3 (patch) | |
| tree | a6fef32e330852138d9e7bd12d7b3dd97c4360c3 /arch/x86/kernel/kdebugfs.c | |
| parent | generic ...copy_..._user primitives (diff) | |
| parent | mm, page_alloc: Add missing check for memory holes (diff) | |
| download | linux-dev-fccfb9950836524d79260448fba6131f6b1d73c3.tar.xz linux-dev-fccfb9950836524d79260448fba6131f6b1d73c3.zip | |
Merge commit 'b4fb8f66f1ae2e167d06c12d018025a8d4d3ba7e' into uaccess.ia64
backmerge of mainline ia64 fix
Diffstat (limited to 'arch/x86/kernel/kdebugfs.c')
| -rw-r--r-- | arch/x86/kernel/kdebugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/kdebugfs.c b/arch/x86/kernel/kdebugfs.c index bdb83e431d89..38b64587b31b 100644 --- a/arch/x86/kernel/kdebugfs.c +++ b/arch/x86/kernel/kdebugfs.c @@ -167,7 +167,7 @@ static int __init boot_params_kdebugfs_init(void) struct dentry *dbp, *version, *data; int error = -ENOMEM; - dbp = debugfs_create_dir("boot_params", NULL); + dbp = debugfs_create_dir("boot_params", arch_debugfs_dir); if (!dbp) return -ENOMEM; |