lkml.org 
[lkml]   [2017]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/12] drm/i915: replace <linux/radix-tree.h> with <linux/radix-tree-root.h>
    Date
    The header drivers/gpu/drm/i915/i915_gem_context.h requires the
    definition of struct radix_tree_root, but does not need to know
    anything about other radix tree stuff.

    Include <linux/radix-tree-root.h> instead of <linux/radix-tree.h> to
    reduce the number of included header files.

    While we are here, let's add missing <linux/radix-tree.h> where
    radix tree accessors are used.

    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    ---

    drivers/gpu/drm/i915/i915_gem.c | 1 +
    drivers/gpu/drm/i915/i915_gem_context.c | 1 +
    drivers/gpu/drm/i915/i915_gem_context.h | 2 +-
    drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1 +
    drivers/gpu/drm/i915/i915_gem_object.h | 1 +
    5 files changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
    index 19404c9..d2356eb 100644
    --- a/drivers/gpu/drm/i915/i915_gem.c
    +++ b/drivers/gpu/drm/i915/i915_gem.c
    @@ -37,6 +37,7 @@
    #include "intel_mocs.h"
    #include <linux/dma-fence-array.h>
    #include <linux/kthread.h>
    +#include <linux/radix-tree.h>
    #include <linux/reservation.h>
    #include <linux/shmem_fs.h>
    #include <linux/slab.h>
    diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
    index 58a2a44..34b2195 100644
    --- a/drivers/gpu/drm/i915/i915_gem_context.c
    +++ b/drivers/gpu/drm/i915/i915_gem_context.c
    @@ -86,6 +86,7 @@
    */

    #include <linux/log2.h>
    +#include <linux/radix-tree.h>
    #include <drm/drmP.h>
    #include <drm/i915_drm.h>
    #include "i915_drv.h"
    diff --git a/drivers/gpu/drm/i915/i915_gem_context.h b/drivers/gpu/drm/i915/i915_gem_context.h
    index 44688e2..0ebe11f 100644
    --- a/drivers/gpu/drm/i915/i915_gem_context.h
    +++ b/drivers/gpu/drm/i915/i915_gem_context.h
    @@ -27,7 +27,7 @@

    #include <linux/bitops.h>
    #include <linux/list.h>
    -#include <linux/radix-tree.h>
    +#include <linux/radix-tree-root.h>

    struct pid;

    diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
    index 92437f4..af9ee58 100644
    --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
    +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
    @@ -27,6 +27,7 @@
    */

    #include <linux/dma_remapping.h>
    +#include <linux/radix-tree.h>
    #include <linux/reservation.h>
    #include <linux/sync_file.h>
    #include <linux/uaccess.h>
    diff --git a/drivers/gpu/drm/i915/i915_gem_object.h b/drivers/gpu/drm/i915/i915_gem_object.h
    index c30d8f8..a5a5506 100644
    --- a/drivers/gpu/drm/i915/i915_gem_object.h
    +++ b/drivers/gpu/drm/i915/i915_gem_object.h
    @@ -25,6 +25,7 @@
    #ifndef __I915_GEM_OBJECT_H__
    #define __I915_GEM_OBJECT_H__

    +#include <linux/radix-tree-root.h>
    #include <linux/reservation.h>

    #include <drm/drm_vma_manager.h>
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-10-08 18:14    [W:4.558 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site