aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 11:02:05 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 11:02:05 -0800
commit03a4491f5d6835028dbbcf36990599c5c9f6ff55 (patch)
treee2abb2baa5b71dcf1eb3786f339afbae5d27d7e4
parent7b0cb1bdac9e941141e3790785955ed933d476f3 (diff)
parent1427130425c1239d977e8891c3a8923f53a6e352 (diff)
downloadkernel_samsung_smdk4412-03a4491f5d6835028dbbcf36990599c5c9f6ff55.tar.gz
kernel_samsung_smdk4412-03a4491f5d6835028dbbcf36990599c5c9f6ff55.tar.bz2
kernel_samsung_smdk4412-03a4491f5d6835028dbbcf36990599c5c9f6ff55.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: ohci: fix compilation on arches without PAGE_KERNEL_RO
-rw-r--r--drivers/firewire/ohci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index d77d120ddc2..bd3c61b6dd8 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -961,7 +961,7 @@ static int ar_context_init(struct ar_context *ctx, struct fw_ohci *ohci,
for (i = 0; i < AR_WRAPAROUND_PAGES; i++)
pages[AR_BUFFERS + i] = ctx->pages[i];
ctx->buffer = vm_map_ram(pages, AR_BUFFERS + AR_WRAPAROUND_PAGES,
- -1, PAGE_KERNEL_RO);
+ -1, PAGE_KERNEL);
if (!ctx->buffer)
goto out_of_memory;