diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2023-02-10 18:11:01 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-02-10 18:11:01 -0800 |
| commit | b8b9ffced017528bcdd262730ab10bc5084c3bb4 (patch) | |
| tree | 1edb4782acb2d6704f3847181a480f375214a40f /lib | |
| parent | dfd423e0a3256f88b8ea622fbbe04f91594195b6 (diff) | |
| parent | 09d09e04d2fcf88c4620dd28097e0e2a8f720eac (diff) | |
| download | linux-stable-b8b9ffced017528bcdd262730ab10bc5084c3bb4.tar.gz linux-stable-b8b9ffced017528bcdd262730ab10bc5084c3bb4.tar.bz2 linux-stable-b8b9ffced017528bcdd262730ab10bc5084c3bb4.zip | |
Merge branch 'for-6.3/cxl-ram-region' into cxl/next
Include the support for enumerating and provisioning ram regions for
v6.3. This also include a default policy change for ram / volatile
device-dax instances to assign them to the dax_kmem driver by default.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stackinit_kunit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/stackinit_kunit.c b/lib/stackinit_kunit.c index 4591d6cf5e01..05947a2feb93 100644 --- a/lib/stackinit_kunit.c +++ b/lib/stackinit_kunit.c @@ -31,8 +31,8 @@ static volatile u8 forced_mask = 0xff; static void *fill_start, *target_start; static size_t fill_size, target_size; -static bool range_contains(char *haystack_start, size_t haystack_size, - char *needle_start, size_t needle_size) +static bool stackinit_range_contains(char *haystack_start, size_t haystack_size, + char *needle_start, size_t needle_size) { if (needle_start >= haystack_start && needle_start + needle_size <= haystack_start + haystack_size) @@ -175,7 +175,7 @@ static noinline void test_ ## name (struct kunit *test) \ \ /* Validate that compiler lined up fill and target. */ \ KUNIT_ASSERT_TRUE_MSG(test, \ - range_contains(fill_start, fill_size, \ + stackinit_range_contains(fill_start, fill_size, \ target_start, target_size), \ "stack fill missed target!? " \ "(fill %zu wide, target offset by %d)\n", \ |