leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix CONFIG_HIGHMEM compile error in drivers/gpu/drm/i915/i915_gem.c

Browse Source 
commit 9b7530cc32 ("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 <tglx@linutronix.de>
[ My bad. It's the same patch I sent out earlier, nobody noticed then either.. ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Thomas Gleixner
2008-10-21 00:47:45 +02:00
committed by Linus Torvalds
parent f6f286f33e
commit e8848a170f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/i915/i915_gem.c
View File

@@ -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 * happens to let us map card memory without taking IPIs. When the vmap
* rework lands we should be able to dump this hack. * 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 #ifdef CONFIG_HIGHMEM
unsigned long unwritten; 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; 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; unsigned long unwritten;
char __iomem *vaddr; char __iomem *vaddr;