fix CONFIG_HIGHMEM compile error in drivers/gpu/drm/i915/i915_gem.c
Subsystems (2)
PATCH 1/1 fix CONFIG_HIGHMEM compile error in drivers/gpu/drm/i915/i915_gem.c
commit 9b7530cc329eb036cfa589930c270e85031f554c
i915: cleanup coding horrors in i915_gem_gtt_pwrite()
broke the i386 build for CONFIG_HIGHMEM=y.
Caught by automatic testing http://www.tglx.de/autoqa-logs/000137-0006-0001.log
Signed-off-by Thomas Gleixner <[email protected]>
---
drivers/gpu/drm/i915/i915_gem.c +3 -2
@@ -182,7 +182,8 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,* happens to let us map card memory without taking IPIs. When the vmap * rework lands we should be able to dump this hack. */ -static inline int fast_user_write (unsigned long pfn,char __user *user_data,int l) +static inline int fast_user_write (unsigned long pfn,char __user *user_data, +int l,int o) {#ifdef CONFIG_HIGHMEM unsigned long unwritten;
@@ -251,7 +252,7 @@ i915_gem_gtt_pwrite(struct drm_device *dev, struct drm_gem_object *obj, pfn = (dev->agp->base >>PAGE_SHIFT ) + i; -if (!fast_user_write (pfn, user_data, l)) { +if (!fast_user_write (pfn, user_data, l, o)) {unsigned long unwritten;char __iomem *vaddr;