aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-10-29 13:57:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-29 13:57:40 -0400
commitc636e176d8e5afe2f3b3e3f1de33ec13f1cee308 (patch)
treef048b6a018796d0f869a1d89a8fbc0ee69876363
parentdb4a57e6d7838a7d54de34569e08048ff9da62a8 (diff)
parent248ff02165437864146d6fbd2d99b2359c3723e6 (diff)
Merge tag 'driver-core-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH: "Here are two small driver core / kernfs fixes for 4.9-rc3. One makes the Kconfig entry for DEBUG_TEST_DRIVER_REMOVE a bit more explicit that this is a crazy thing to enable for a distro kernel (thanks for trying Fedora!), the other resolves an issue with vim opening kernfs files (sysfs, configfs, etc.) Both have been in linux-next with no reported issues" * tag 'driver-core-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: driver core: Make Kconfig text for DEBUG_TEST_DRIVER_REMOVE stronger kernfs: Add noop_fsync to supported kernfs_file_fops
-rw-r--r--drivers/base/Kconfig6
-rw-r--r--fs/kernfs/file.c1
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index fdf44cac08e6..d02e7c0f5bfd 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -213,14 +213,16 @@ config DEBUG_DEVRES
213 If you are unsure about this, Say N here. 213 If you are unsure about this, Say N here.
214 214
215config DEBUG_TEST_DRIVER_REMOVE 215config DEBUG_TEST_DRIVER_REMOVE
216 bool "Test driver remove calls during probe" 216 bool "Test driver remove calls during probe (UNSTABLE)"
217 depends on DEBUG_KERNEL 217 depends on DEBUG_KERNEL
218 help 218 help
219 Say Y here if you want the Driver core to test driver remove functions 219 Say Y here if you want the Driver core to test driver remove functions
220 by calling probe, remove, probe. This tests the remove path without 220 by calling probe, remove, probe. This tests the remove path without
221 having to unbind the driver or unload the driver module. 221 having to unbind the driver or unload the driver module.
222 222
223 If you are unsure about this, say N here. 223 This option is expected to find errors and may render your system
224 unusable. You should say N here unless you are explicitly looking to
225 test this functionality.
224 226
225config SYS_HYPERVISOR 227config SYS_HYPERVISOR
226 bool 228 bool
diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index 2bcb86e6e6ca..78219d5644e9 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -911,6 +911,7 @@ const struct file_operations kernfs_file_fops = {
911 .open = kernfs_fop_open, 911 .open = kernfs_fop_open,
912 .release = kernfs_fop_release, 912 .release = kernfs_fop_release,
913 .poll = kernfs_fop_poll, 913 .poll = kernfs_fop_poll,
914 .fsync = noop_fsync,
914}; 915};
915 916
916/** 917/**