drm: Fix mismerge of non-coherent DMA patch

Browse source

The patch for supporting non coherent PCI DMA in the DRM was mismerged
causing the page protection to be updated for the wrong type of
mapping.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

...

This commit is contained in:

Benjamin Herrenschmidt 2008-04-20 10:26:25 +10:00 • committed by Dave Airlie

parent b1721d0da2

commit 5ff6461133

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/char/drm/drm_vm.c

View file