openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge tag 'drm-amdkfd-next-fixes-2015-08-30' of git://people.freedesktop.org/~gabbayo/linux into drm-next 

Just one small fix before 4.3 merge window:

- Use linux/mman.h instead of uapi's mman-common.h inside the driver.

* tag 'drm-amdkfd-next-fixes-2015-08-30' of git://people.freedesktop.org/~gabbayo/linux:
  amdkfd: use <linux/mman.h> instead of <uapi/asm-generic/mman-common.h>
This commit is contained in:
Dave Airlie 2015-08-31 10:05:37 +10:00
parent 92cffd56b2 2497ee7215
commit d3e8ea5092
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
View File

@ -31,7 +31,7 @@
#include <uapi/linux/kfd_ioctl.h>
#include <linux/time.h>
#include <linux/mm.h>
#include <uapi/asm-generic/mman-common.h>
#include <linux/mman.h>
#include <asm/processor.h>
#include "kfd_priv.h"
#include "kfd_device_queue_manager.h"

2
drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c
View File

@ -33,7 +33,7 @@
#include <linux/time.h>
#include "kfd_priv.h"
#include <linux/mm.h>
#include <uapi/asm-generic/mman-common.h>
#include <linux/mman.h>
#include <asm/processor.h>
/*