Skip to content

Commit

Permalink
fix CONFIG_HIGHMEM compile error in drivers/gpu/drm/i915/i915_gem.c
Browse files Browse the repository at this point in the history
commit 9b7530c ("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>
  • Loading branch information
KAGA-KOKO authored and torvalds committed Oct 20, 2008
1 parent f6f286f commit e8848a1
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit e8848a1

Please sign in to comment.