From: Thomas Gleixner Date: Mon, 20 Oct 2008 22:47:45 +0000 (+0200) Subject: fix CONFIG_HIGHMEM compile error in drivers/gpu/drm/i915/i915_gem.c X-Git-Tag: v2.6.28-rc1~69 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e8848a170fd432bdda176a2d568919d4bba90467;p=linux-2.6-omap-h63xx.git 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 [ My bad. It's the same patch I sent out earlier, nobody noticed then either.. ] Signed-off-by: Linus Torvalds --- diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 49c5a1798ac..dc2e6fdb6ca 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -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;