diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-05-18 06:08:53 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-05-18 06:08:53 +0200 |
| commit | 1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0 (patch) | |
| tree | f829e8a26fc768666eb5f827bf5817892ea7e46c /lib/find_bit_benchmark.c | |
| parent | drm: rcar-du: Fix build failure (diff) | |
| parent | drm: set FMODE_UNSIGNED_OFFSET for drm files (diff) | |
| download | linux-1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0.tar.xz linux-1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0.zip | |
Merge drm-fixes-for-v4.17-rc6-urgent into drm-next
Need to backmerge some nouveau fixes to reduce
the nouveau -next conflicts a lot.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'lib/find_bit_benchmark.c')
| -rw-r--r-- | lib/find_bit_benchmark.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/find_bit_benchmark.c b/lib/find_bit_benchmark.c index 5985a25e6cbc..5367ffa5c18f 100644 --- a/lib/find_bit_benchmark.c +++ b/lib/find_bit_benchmark.c @@ -132,7 +132,12 @@ static int __init find_bit_test(void) test_find_next_bit(bitmap, BITMAP_LEN); test_find_next_zero_bit(bitmap, BITMAP_LEN); test_find_last_bit(bitmap, BITMAP_LEN); - test_find_first_bit(bitmap, BITMAP_LEN); + + /* + * test_find_first_bit() may take some time, so + * traverse only part of bitmap to avoid soft lockup. + */ + test_find_first_bit(bitmap, BITMAP_LEN / 10); test_find_next_and_bit(bitmap, bitmap2, BITMAP_LEN); pr_err("\nStart testing find_bit() with sparse bitmap\n"); |