diff options
| author | Linus Torvalds | 2011-01-13 20:02:05 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2011-01-13 20:02:05 +0100 |
| commit | 03a4491f5d6835028dbbcf36990599c5c9f6ff55 (patch) | |
| tree | e2abb2baa5b71dcf1eb3786f339afbae5d27d7e4 | |
| parent | Merge branch 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block (diff) | |
| parent | firewire: ohci: fix compilation on arches without PAGE_KERNEL_RO (diff) | |
| download | kernel-qcow2-linux-03a4491f5d6835028dbbcf36990599c5c9f6ff55.tar.gz kernel-qcow2-linux-03a4491f5d6835028dbbcf36990599c5c9f6ff55.tar.xz kernel-qcow2-linux-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.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, 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; |