commit 03a4491f5d6835028dbbcf36990599c5c9f6ff55
author Linus Torvalds <torvalds@linux-foundation.org> Thu Jan 13 11:02:05 2011 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Jan 13 11:02:05 2011 -0800
tree e2abb2baa5b71dcf1eb3786f339afbae5d27d7e4
parent 7b0cb1bdac9e941141e3790785955ed933d476f3
parent 1427130425c1239d977e8891c3a8923f53a6e352

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

drivers/firewire/ohci.c

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index d77d120..bd3c61b 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -961,7 +961,7 @@
 	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;