| Message ID | 20220124094418.2661-1-andi.shyti@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3] drm/i915: fix header file inclusion for might_alloc() | expand |
Op 24-01-2022 om 10:44 schreef Andi Shyti: > Replace "linux/slab.h" with "linux/sched/mm.h" header inclusion > as the first is not required, while the second, if not included, > prodouces the following error: > > drivers/gpu/drm/i915/i915_vma_resource.c: In function ‘i915_vma_resource_bind_dep_await’: > drivers/gpu/drm/i915/i915_vma_resource.c:381:9: error: implicit declaration of function ‘might_alloc’; did you mean ‘might_lock’? [-Werror=implicit-function-declaration] > 381 | might_alloc(gfp); > | ^~~~~~~~~~~ > | might_lock > > Fixes: 2f6b90da9192 ("drm/i915: Use vma resources for async unbinding") > Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> > Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> > Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> > --- > Hi, > > v3: fixed a typo in the commit log (prduces/produces). (Thanks > Thomas Zimmermann) > > v2: added the 'Fixes' tag (I think I got the right commit) and > Thomas Hellström r-b. > > Andi > > drivers/gpu/drm/i915/i915_vma_resource.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_vma_resource.c b/drivers/gpu/drm/i915/i915_vma_resource.c > index 1f41c0c699eb..bbb0ff14272f 100644 > --- a/drivers/gpu/drm/i915/i915_vma_resource.c > +++ b/drivers/gpu/drm/i915/i915_vma_resource.c > @@ -4,7 +4,7 @@ > */ > > #include <linux/interval_tree_generic.h> > -#include <linux/slab.h> > +#include <linux/sched/mm.h> > > #include "i915_sw_fence.h" > #include "i915_vma_resource.h" Pushed to drm-intel-gt-next. Should fix drm-tip building, probably needs to be pulled into drm-fixes asap. :)
diff --git a/drivers/gpu/drm/i915/i915_vma_resource.c b/drivers/gpu/drm/i915/i915_vma_resource.c index 1f41c0c699eb..bbb0ff14272f 100644 --- a/drivers/gpu/drm/i915/i915_vma_resource.c +++ b/drivers/gpu/drm/i915/i915_vma_resource.c @@ -4,7 +4,7 @@ */ #include <linux/interval_tree_generic.h> -#include <linux/slab.h> +#include <linux/sched/mm.h> #include "i915_sw_fence.h" #include "i915_vma_resource.h"
Replace "linux/slab.h" with "linux/sched/mm.h" header inclusion as the first is not required, while the second, if not included, prodouces the following error: drivers/gpu/drm/i915/i915_vma_resource.c: In function ‘i915_vma_resource_bind_dep_await’: drivers/gpu/drm/i915/i915_vma_resource.c:381:9: error: implicit declaration of function ‘might_alloc’; did you mean ‘might_lock’? [-Werror=implicit-function-declaration] 381 | might_alloc(gfp); | ^~~~~~~~~~~ | might_lock Fixes: 2f6b90da9192 ("drm/i915: Use vma resources for async unbinding") Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> --- Hi, v3: fixed a typo in the commit log (prduces/produces). (Thanks Thomas Zimmermann) v2: added the 'Fixes' tag (I think I got the right commit) and Thomas Hellström r-b. Andi drivers/gpu/drm/i915/i915_vma_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)