diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2024-05-02 11:25:27 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2024-05-02 11:25:27 +0200 |
| commit | b0a835db17434473dfb84f7646de1cedc4ecdb94 (patch) | |
| tree | 5ca9891b58895b99555ec7717129eb22cb3c0a19 /lib | |
| parent | drm/panel: ili9341: Remove a superfluous else after return (diff) | |
| parent | Merge tag 'amd-drm-next-6.10-2024-04-26' of https://gitlab.freedesktop.org/ag... (diff) | |
| download | linux-b0a835db17434473dfb84f7646de1cedc4ecdb94.tar.xz linux-b0a835db17434473dfb84f7646de1cedc4ecdb94.zip | |
Merge drm/drm-next into drm-misc-next
Backmerging to get DRM fixes from v6.9-rc6.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stackdepot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stackdepot.c b/lib/stackdepot.c index 68c97387aa54..cd8f23455285 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -627,10 +627,10 @@ depot_stack_handle_t stack_depot_save_flags(unsigned long *entries, /* * Zero out zone modifiers, as we don't have specific zone * requirements. Keep the flags related to allocation in atomic - * contexts and I/O. + * contexts, I/O, nolockdep. */ alloc_flags &= ~GFP_ZONEMASK; - alloc_flags &= (GFP_ATOMIC | GFP_KERNEL); + alloc_flags &= (GFP_ATOMIC | GFP_KERNEL | __GFP_NOLOCKDEP); alloc_flags |= __GFP_NOWARN; page = alloc_pages(alloc_flags, DEPOT_POOL_ORDER); if (page) |