diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 14:02:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 14:02:05 -0500 |
| commit | 03a4491f5d6835028dbbcf36990599c5c9f6ff55 (patch) | |
| tree | e2abb2baa5b71dcf1eb3786f339afbae5d27d7e4 | |
| parent | 7b0cb1bdac9e941141e3790785955ed933d476f3 (diff) | |
| parent | 1427130425c1239d977e8891c3a8923f53a6e352 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index d77d120ddc25..bd3c61b6dd8d 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, | |||
| 961 | for (i = 0; i < AR_WRAPAROUND_PAGES; i++) | 961 | for (i = 0; i < AR_WRAPAROUND_PAGES; i++) |
| 962 | pages[AR_BUFFERS + i] = ctx->pages[i]; | 962 | pages[AR_BUFFERS + i] = ctx->pages[i]; |
| 963 | ctx->buffer = vm_map_ram(pages, AR_BUFFERS + AR_WRAPAROUND_PAGES, | 963 | ctx->buffer = vm_map_ram(pages, AR_BUFFERS + AR_WRAPAROUND_PAGES, |
| 964 | -1, PAGE_KERNEL_RO); | 964 | -1, PAGE_KERNEL); |
| 965 | if (!ctx->buffer) | 965 | if (!ctx->buffer) |
| 966 | goto out_of_memory; | 966 | goto out_of_memory; |
| 967 | 967 | ||