lkml.org 
[lkml]   [2013]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 8/9] drm: Remove mtrr_add and mtrr_del fallback hack for non-MTRR systems
    Date
    There are no users left in drivers/gpu.

    Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Andy Lutomirski <luto@amacapital.net>
    ---
    include/drm/drmP.h | 5 +----
    include/drm/drm_os_linux.h | 16 ----------------
    2 files changed, 1 insertion(+), 20 deletions(-)

    diff --git a/include/drm/drmP.h b/include/drm/drmP.h
    index 3e6cfa0..7a9fef5 100644
    --- a/include/drm/drmP.h
    +++ b/include/drm/drmP.h
    @@ -55,16 +55,13 @@
    #include <linux/mm.h>
    #include <linux/cdev.h>
    #include <linux/mutex.h>
    +#include <linux/io.h>
    #include <linux/slab.h>
    #if defined(__alpha__) || defined(__powerpc__)
    #include <asm/pgtable.h> /* For pte_wrprotect */
    #endif
    -#include <asm/io.h>
    #include <asm/mman.h>
    #include <asm/uaccess.h>
    -#ifdef CONFIG_MTRR
    -#include <asm/mtrr.h>
    -#endif
    #if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
    #include <linux/types.h>
    #include <linux/agp_backend.h>
    diff --git a/include/drm/drm_os_linux.h b/include/drm/drm_os_linux.h
    index 3933691..35c7c2b 100644
    --- a/include/drm/drm_os_linux.h
    +++ b/include/drm/drm_os_linux.h
    @@ -65,22 +65,6 @@ struct no_agp_kern {
    #define DRM_AGP_KERN struct no_agp_kern
    #endif

    -#if !(__OS_HAS_MTRR)
    -static __inline__ int mtrr_add(unsigned long base, unsigned long size,
    - unsigned int type, char increment)
    -{
    - return -ENODEV;
    -}
    -
    -static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size)
    -{
    - return -ENODEV;
    -}
    -
    -#define MTRR_TYPE_WRCOMB 1
    -
    -#endif
    -
    /** Other copying of data to kernel space */
    #define DRM_COPY_FROM_USER(arg1, arg2, arg3) \
    copy_from_user(arg1, arg2, arg3)
    --
    1.8.1.4


    \
     
     \ /
      Last update: 2013-05-14 02:21    [W:2.336 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site