diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2024-08-16 19:43:16 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2024-08-16 19:43:16 -0300 |
commit | 3bce87eb744f1f88523a118e10e0deebf31806ec (patch) | |
tree | 02f9090ff510c97ce442a07b807615ad00f1406b /lib/overflow_kunit.c | |
parent | 2615639352420e6e3115952c5b8f46846e1c6d0e (diff) | |
parent | 85652baa895b59b94bea29c77cb9b51cf7120deb (diff) |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick up the latest perf-tools merge for 6.11, i.e. to have the
current perf tools branch that is getting into 6.11 with the
perf-tools-next that is geared towards 6.12.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'lib/overflow_kunit.c')
-rw-r--r-- | lib/overflow_kunit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/overflow_kunit.c b/lib/overflow_kunit.c index f314a0c15a6d..2abc78367dd1 100644 --- a/lib/overflow_kunit.c +++ b/lib/overflow_kunit.c @@ -668,7 +668,6 @@ DEFINE_TEST_ALLOC(devm_kzalloc, devm_kfree, 1, 1, 0); static void overflow_allocation_test(struct kunit *test) { - const char device_name[] = "overflow-test"; struct device *dev; int count = 0; @@ -678,7 +677,7 @@ static void overflow_allocation_test(struct kunit *test) } while (0) /* Create dummy device for devm_kmalloc()-family tests. */ - dev = kunit_device_register(test, device_name); + dev = kunit_device_register(test, "overflow-test"); KUNIT_ASSERT_FALSE_MSG(test, IS_ERR(dev), "Cannot register test device\n"); |