Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-bionic-kernel.git] / kernel / bpf / devmap.c

diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
index ecf9f99ecc579e315f4651032a8b39415d5b4d81..959c9a07f318b14f6ab4719973f6010de061aadc 100644 (file)
--- a/kernel/bpf/devmap.c
+++ b/kernel/bpf/devmap.c
@@ -159,7 +159,7 @@ static void dev_map_free(struct bpf_map *map)
                unsigned long *bitmap = per_cpu_ptr(dtab->flush_needed, cpu);
 
                while (!bitmap_empty(bitmap, dtab->map.max_entries))
-                       cpu_relax();
+                       cond_resched();
        }
 
        for (i = 0; i < dtab->map.max_entries; i++) {