Commit 03a4491f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7b0cb1bd 14271304

drivers/firewire/ohci.c

+1 −1
Original line number Diff line number Diff line
@@ -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;