On Fri, Aug 28, 2015 at 10:27 AM, Christoph Hellwig <hch@xxxxxx> wrote: > > The latter is a default version of <asm/mman.h> and not for driver use. > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > --- > drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- > drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c > index c991973..c6a1b4c 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c > @@ -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" > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c > index 35b9875..2b65510 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c > @@ -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> > > /* > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ Thanks, Applied to my -next-fixes tree Oded -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
