Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'linux_kselftest-kunit-fixes-6.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kunit fixes from Shuah Khan:
"Drop unused parameter from kunit_device_register_internal and make
FAULT_TEST default to n when PANIC_ON_OOPS"

* tag 'linux_kselftest-kunit-fixes-6.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
kunit: make FAULT_TEST default to n when PANIC_ON_OOPS
kunit: Drop unused parameter from kunit_device_register_internal

+4 -5
+1 -1
lib/kunit/Kconfig
··· 28 28 bool "Enable KUnit tests which print BUG stacktraces" 29 29 depends on KUNIT_TEST 30 30 depends on !UML 31 - default y 31 + default !PANIC_ON_OOPS 32 32 help 33 33 Enables fault handling tests for the KUnit framework. These tests may 34 34 trigger a kernel BUG(), and the associated stack trace, even when they
+3 -4
lib/kunit/device.c
··· 106 106 107 107 /* Helper which creates a kunit_device, attaches it to the kunit_bus*/ 108 108 static struct kunit_device *kunit_device_register_internal(struct kunit *test, 109 - const char *name, 110 - const struct device_driver *drv) 109 + const char *name) 111 110 { 112 111 struct kunit_device *kunit_dev; 113 112 int err = -ENOMEM; ··· 149 150 const char *name, 150 151 const struct device_driver *drv) 151 152 { 152 - struct kunit_device *kunit_dev = kunit_device_register_internal(test, name, drv); 153 + struct kunit_device *kunit_dev = kunit_device_register_internal(test, name); 153 154 154 155 if (IS_ERR_OR_NULL(kunit_dev)) 155 156 return ERR_CAST(kunit_dev); ··· 171 172 if (IS_ERR(drv)) 172 173 return ERR_CAST(drv); 173 174 174 - dev = kunit_device_register_internal(test, name, drv); 175 + dev = kunit_device_register_internal(test, name); 175 176 if (IS_ERR(dev)) { 176 177 kunit_release_action(test, driver_unregister_wrapper, (void *)drv); 177 178 return ERR_CAST(dev);