diff for duplicates of <20120614014902.GB7289@localhost> diff --git a/a/1.txt b/N1/1.txt index 3ea1c07..5ab2f0a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -208,7 +208,8 @@ index 2aad499..3f736d1 100644 -- 1.7.10 -_______________________________________________ -xfs mailing list -xfs@oss.sgi.com -http://oss.sgi.com/mailman/listinfo/xfs +-- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index 5151b0d..86d56a6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,13 +5,13 @@ "Subject\0[PATCH] mm: add gfp_mask parameter to vm_map_ram()\0" "Date\0Thu, 14 Jun 2012 09:49:02 +0800\0" "To\0Dave Chinner <dchinner@redhat.com>\0" - "Cc\0LKML <linux-kernel@vger.kernel.org>" - xfs@oss.sgi.com - Christoph Hellwig <hch@infradead.org> - Linux Memory Management List <linux-mm@kvack.org> + "Cc\0Christoph Hellwig <hch@infradead.org>" linux-fsdevel@vger.kernel.org + LKML <linux-kernel@vger.kernel.org> + Andrew Morton <akpm@linux-foundation.org> Tejun Heo <tj@kernel.org> - " Andrew Morton <akpm@linux-foundation.org>\0" + Linux Memory Management List <linux-mm@kvack.org> + " xfs@oss.sgi.com\0" "\00:1\0" "b\0" "On Thu, Jun 14, 2012 at 11:20:26AM +1000, Dave Chinner wrote:\n" @@ -224,9 +224,10 @@ "-- \n" "1.7.10\n" "\n" - "_______________________________________________\n" - "xfs mailing list\n" - "xfs@oss.sgi.com\n" - http://oss.sgi.com/mailman/listinfo/xfs + "--\n" + "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" + "the body to majordomo@kvack.org. For more info on Linux MM,\n" + "see: http://www.linux-mm.org/ .\n" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -e53a858c6dd09135203198c13ee161724adc1a61f01eae735e5e65c97b3e24b2 +6b1fff4bb2df273417f34891eeeea39997922e6e0748d39c75b6f349555ff39c
diff --git a/a/1.txt b/N2/1.txt index 3ea1c07..fd05164 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -78,137 +78,3 @@ Does that look fine to you? Thanks, Fengguang --- - ->From 7301975d3211da2ce07723c294cf3260229fe84b Mon Sep 17 00:00:00 2001 -From: Fengguang Wu <fengguang.wu@intel.com> -Date: Thu, 14 Jun 2012 09:38:33 +0800 -Subject: [PATCH] mm: add @gfp_mask parameter to vm_map_ram() - -XFS needs GFP_NOFS allocation. - -Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> ---- - drivers/firewire/ohci.c | 2 +- - drivers/media/video/videobuf2-dma-sg.c | 1 + - drivers/media/video/videobuf2-vmalloc.c | 2 +- - fs/xfs/xfs_buf.c | 2 +- - include/linux/vmalloc.h | 2 +- - mm/nommu.c | 3 ++- - mm/vmalloc.c | 7 ++++--- - 7 files changed, 11 insertions(+), 8 deletions(-) - -diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c -index c1af05e..b53f5a9 100644 ---- a/drivers/firewire/ohci.c -+++ b/drivers/firewire/ohci.c -@@ -1000,7 +1000,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); -+ -1, GFP_KERNEL, PAGE_KERNEL); - if (!ctx->buffer) - goto out_of_memory; - -diff --git a/drivers/media/video/videobuf2-dma-sg.c b/drivers/media/video/videobuf2-dma-sg.c -index 25c3b36..d087f52 100644 ---- a/drivers/media/video/videobuf2-dma-sg.c -+++ b/drivers/media/video/videobuf2-dma-sg.c -@@ -209,6 +209,7 @@ static void *vb2_dma_sg_vaddr(void *buf_priv) - buf->vaddr = vm_map_ram(buf->pages, - buf->sg_desc.num_pages, - -1, -+ GFP_KERNEL, - PAGE_KERNEL); - - /* add offset in case userptr is not page-aligned */ -diff --git a/drivers/media/video/videobuf2-vmalloc.c b/drivers/media/video/videobuf2-vmalloc.c -index 6b5ca6c..548ebda 100644 ---- a/drivers/media/video/videobuf2-vmalloc.c -+++ b/drivers/media/video/videobuf2-vmalloc.c -@@ -111,7 +111,7 @@ static void *vb2_vmalloc_get_userptr(void *alloc_ctx, unsigned long vaddr, - goto fail_get_user_pages; - - buf->vaddr = vm_map_ram(buf->pages, buf->n_pages, -1, -- PAGE_KERNEL); -+ GFP_KERNEL, PAGE_KERNEL); - if (!buf->vaddr) - goto fail_get_user_pages; - } -diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c -index 172d3cc..b3e7289 100644 ---- a/fs/xfs/xfs_buf.c -+++ b/fs/xfs/xfs_buf.c -@@ -406,7 +406,7 @@ _xfs_buf_map_pages( - - do { - bp->b_addr = vm_map_ram(bp->b_pages, bp->b_page_count, -- -1, PAGE_KERNEL); -+ -1, GFP_NOFS, PAGE_KERNEL); - if (bp->b_addr) - break; - vm_unmap_aliases(); -diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h -index dcdfc2b..c811763 100644 ---- a/include/linux/vmalloc.h -+++ b/include/linux/vmalloc.h -@@ -40,7 +40,7 @@ struct vm_struct { - */ - extern void vm_unmap_ram(const void *mem, unsigned int count); - extern void *vm_map_ram(struct page **pages, unsigned int count, -- int node, pgprot_t prot); -+ int node, gfp_t gfp_mask, pgprot_t prot); - extern void vm_unmap_aliases(void); - - #ifdef CONFIG_MMU -diff --git a/mm/nommu.c b/mm/nommu.c -index d4b0c10..2fb4ec1 100644 ---- a/mm/nommu.c -+++ b/mm/nommu.c -@@ -416,7 +416,8 @@ void vunmap(const void *addr) - } - EXPORT_SYMBOL(vunmap); - --void *vm_map_ram(struct page **pages, unsigned int count, int node, pgprot_t prot) -+void *vm_map_ram(struct page **pages, unsigned int count, -+ int node, gfp_t gfp_mask, pgprot_t prot) - { - BUG(); - return NULL; -diff --git a/mm/vmalloc.c b/mm/vmalloc.c -index 2aad499..3f736d1 100644 ---- a/mm/vmalloc.c -+++ b/mm/vmalloc.c -@@ -1088,21 +1088,22 @@ EXPORT_SYMBOL(vm_unmap_ram); - * - * Returns: a pointer to the address that has been mapped, or %NULL on failure - */ --void *vm_map_ram(struct page **pages, unsigned int count, int node, pgprot_t prot) -+void *vm_map_ram(struct page **pages, unsigned int count, -+ int node, gfp_t gfp_mask, pgprot_t prot) - { - unsigned long size = count << PAGE_SHIFT; - unsigned long addr; - void *mem; - - if (likely(count <= VMAP_MAX_ALLOC)) { -- mem = vb_alloc(size, GFP_KERNEL); -+ mem = vb_alloc(size, gfp_mask); - if (IS_ERR(mem)) - return NULL; - addr = (unsigned long)mem; - } else { - struct vmap_area *va; - va = alloc_vmap_area(size, PAGE_SIZE, -- VMALLOC_START, VMALLOC_END, node, GFP_KERNEL); -+ VMALLOC_START, VMALLOC_END, node, gfp_mask); - if (IS_ERR(va)) - return NULL; - --- -1.7.10 - -_______________________________________________ -xfs mailing list -xfs@oss.sgi.com -http://oss.sgi.com/mailman/listinfo/xfs diff --git a/a/content_digest b/N2/content_digest index 5151b0d..249cb3d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,13 +5,13 @@ "Subject\0[PATCH] mm: add gfp_mask parameter to vm_map_ram()\0" "Date\0Thu, 14 Jun 2012 09:49:02 +0800\0" "To\0Dave Chinner <dchinner@redhat.com>\0" - "Cc\0LKML <linux-kernel@vger.kernel.org>" - xfs@oss.sgi.com - Christoph Hellwig <hch@infradead.org> - Linux Memory Management List <linux-mm@kvack.org> + "Cc\0Christoph Hellwig <hch@infradead.org>" linux-fsdevel@vger.kernel.org + LKML <linux-kernel@vger.kernel.org> + Andrew Morton <akpm@linux-foundation.org> Tejun Heo <tj@kernel.org> - " Andrew Morton <akpm@linux-foundation.org>\0" + Linux Memory Management List <linux-mm@kvack.org> + " xfs@oss.sgi.com\0" "\00:1\0" "b\0" "On Thu, Jun 14, 2012 at 11:20:26AM +1000, Dave Chinner wrote:\n" @@ -93,140 +93,6 @@ "\n" "Thanks,\n" "Fengguang\n" - "---\n" - "\n" - ">From 7301975d3211da2ce07723c294cf3260229fe84b Mon Sep 17 00:00:00 2001\n" - "From: Fengguang Wu <fengguang.wu@intel.com>\n" - "Date: Thu, 14 Jun 2012 09:38:33 +0800\n" - "Subject: [PATCH] mm: add @gfp_mask parameter to vm_map_ram()\n" - "\n" - "XFS needs GFP_NOFS allocation.\n" - "\n" - "Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>\n" - "---\n" - " drivers/firewire/ohci.c | 2 +-\n" - " drivers/media/video/videobuf2-dma-sg.c | 1 +\n" - " drivers/media/video/videobuf2-vmalloc.c | 2 +-\n" - " fs/xfs/xfs_buf.c | 2 +-\n" - " include/linux/vmalloc.h | 2 +-\n" - " mm/nommu.c | 3 ++-\n" - " mm/vmalloc.c | 7 ++++---\n" - " 7 files changed, 11 insertions(+), 8 deletions(-)\n" - "\n" - "diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c\n" - "index c1af05e..b53f5a9 100644\n" - "--- a/drivers/firewire/ohci.c\n" - "+++ b/drivers/firewire/ohci.c\n" - "@@ -1000,7 +1000,7 @@ static int ar_context_init(struct ar_context *ctx, struct fw_ohci *ohci,\n" - " \tfor (i = 0; i < AR_WRAPAROUND_PAGES; i++)\n" - " \t\tpages[AR_BUFFERS + i] = ctx->pages[i];\n" - " \tctx->buffer = vm_map_ram(pages, AR_BUFFERS + AR_WRAPAROUND_PAGES,\n" - "-\t\t\t\t -1, PAGE_KERNEL);\n" - "+\t\t\t\t -1, GFP_KERNEL, PAGE_KERNEL);\n" - " \tif (!ctx->buffer)\n" - " \t\tgoto out_of_memory;\n" - " \n" - "diff --git a/drivers/media/video/videobuf2-dma-sg.c b/drivers/media/video/videobuf2-dma-sg.c\n" - "index 25c3b36..d087f52 100644\n" - "--- a/drivers/media/video/videobuf2-dma-sg.c\n" - "+++ b/drivers/media/video/videobuf2-dma-sg.c\n" - "@@ -209,6 +209,7 @@ static void *vb2_dma_sg_vaddr(void *buf_priv)\n" - " \t\tbuf->vaddr = vm_map_ram(buf->pages,\n" - " \t\t\t\t\tbuf->sg_desc.num_pages,\n" - " \t\t\t\t\t-1,\n" - "+\t\t\t\t\tGFP_KERNEL,\n" - " \t\t\t\t\tPAGE_KERNEL);\n" - " \n" - " \t/* add offset in case userptr is not page-aligned */\n" - "diff --git a/drivers/media/video/videobuf2-vmalloc.c b/drivers/media/video/videobuf2-vmalloc.c\n" - "index 6b5ca6c..548ebda 100644\n" - "--- a/drivers/media/video/videobuf2-vmalloc.c\n" - "+++ b/drivers/media/video/videobuf2-vmalloc.c\n" - "@@ -111,7 +111,7 @@ static void *vb2_vmalloc_get_userptr(void *alloc_ctx, unsigned long vaddr,\n" - " \t\t\tgoto fail_get_user_pages;\n" - " \n" - " \t\tbuf->vaddr = vm_map_ram(buf->pages, buf->n_pages, -1,\n" - "-\t\t\t\t\tPAGE_KERNEL);\n" - "+\t\t\t\t\tGFP_KERNEL, PAGE_KERNEL);\n" - " \t\tif (!buf->vaddr)\n" - " \t\t\tgoto fail_get_user_pages;\n" - " \t}\n" - "diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c\n" - "index 172d3cc..b3e7289 100644\n" - "--- a/fs/xfs/xfs_buf.c\n" - "+++ b/fs/xfs/xfs_buf.c\n" - "@@ -406,7 +406,7 @@ _xfs_buf_map_pages(\n" - " \n" - " \t\tdo {\n" - " \t\t\tbp->b_addr = vm_map_ram(bp->b_pages, bp->b_page_count,\n" - "-\t\t\t\t\t\t-1, PAGE_KERNEL);\n" - "+\t\t\t\t\t\t-1, GFP_NOFS, PAGE_KERNEL);\n" - " \t\t\tif (bp->b_addr)\n" - " \t\t\t\tbreak;\n" - " \t\t\tvm_unmap_aliases();\n" - "diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h\n" - "index dcdfc2b..c811763 100644\n" - "--- a/include/linux/vmalloc.h\n" - "+++ b/include/linux/vmalloc.h\n" - "@@ -40,7 +40,7 @@ struct vm_struct {\n" - " */\n" - " extern void vm_unmap_ram(const void *mem, unsigned int count);\n" - " extern void *vm_map_ram(struct page **pages, unsigned int count,\n" - "-\t\t\t\tint node, pgprot_t prot);\n" - "+\t\t\t\tint node, gfp_t gfp_mask, pgprot_t prot);\n" - " extern void vm_unmap_aliases(void);\n" - " \n" - " #ifdef CONFIG_MMU\n" - "diff --git a/mm/nommu.c b/mm/nommu.c\n" - "index d4b0c10..2fb4ec1 100644\n" - "--- a/mm/nommu.c\n" - "+++ b/mm/nommu.c\n" - "@@ -416,7 +416,8 @@ void vunmap(const void *addr)\n" - " }\n" - " EXPORT_SYMBOL(vunmap);\n" - " \n" - "-void *vm_map_ram(struct page **pages, unsigned int count, int node, pgprot_t prot)\n" - "+void *vm_map_ram(struct page **pages, unsigned int count,\n" - "+\t\t int node, gfp_t gfp_mask, pgprot_t prot)\n" - " {\n" - " \tBUG();\n" - " \treturn NULL;\n" - "diff --git a/mm/vmalloc.c b/mm/vmalloc.c\n" - "index 2aad499..3f736d1 100644\n" - "--- a/mm/vmalloc.c\n" - "+++ b/mm/vmalloc.c\n" - "@@ -1088,21 +1088,22 @@ EXPORT_SYMBOL(vm_unmap_ram);\n" - " *\n" - " * Returns: a pointer to the address that has been mapped, or %NULL on failure\n" - " */\n" - "-void *vm_map_ram(struct page **pages, unsigned int count, int node, pgprot_t prot)\n" - "+void *vm_map_ram(struct page **pages, unsigned int count,\n" - "+\t\t int node, gfp_t gfp_mask, pgprot_t prot)\n" - " {\n" - " \tunsigned long size = count << PAGE_SHIFT;\n" - " \tunsigned long addr;\n" - " \tvoid *mem;\n" - " \n" - " \tif (likely(count <= VMAP_MAX_ALLOC)) {\n" - "-\t\tmem = vb_alloc(size, GFP_KERNEL);\n" - "+\t\tmem = vb_alloc(size, gfp_mask);\n" - " \t\tif (IS_ERR(mem))\n" - " \t\t\treturn NULL;\n" - " \t\taddr = (unsigned long)mem;\n" - " \t} else {\n" - " \t\tstruct vmap_area *va;\n" - " \t\tva = alloc_vmap_area(size, PAGE_SIZE,\n" - "-\t\t\t\tVMALLOC_START, VMALLOC_END, node, GFP_KERNEL);\n" - "+\t\t\t\tVMALLOC_START, VMALLOC_END, node, gfp_mask);\n" - " \t\tif (IS_ERR(va))\n" - " \t\t\treturn NULL;\n" - " \n" - "-- \n" - "1.7.10\n" - "\n" - "_______________________________________________\n" - "xfs mailing list\n" - "xfs@oss.sgi.com\n" - http://oss.sgi.com/mailman/listinfo/xfs + --- -e53a858c6dd09135203198c13ee161724adc1a61f01eae735e5e65c97b3e24b2 +d514cfc3e92affac52745b9a3b98bdb4c8c8093c01f8d6b864947978ea5fae88
diff --git a/a/1.txt b/N3/1.txt index 3ea1c07..6639574 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -207,8 +207,3 @@ index 2aad499..3f736d1 100644 -- 1.7.10 - -_______________________________________________ -xfs mailing list -xfs@oss.sgi.com -http://oss.sgi.com/mailman/listinfo/xfs diff --git a/a/content_digest b/N3/content_digest index 5151b0d..e9016be 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -5,13 +5,13 @@ "Subject\0[PATCH] mm: add gfp_mask parameter to vm_map_ram()\0" "Date\0Thu, 14 Jun 2012 09:49:02 +0800\0" "To\0Dave Chinner <dchinner@redhat.com>\0" - "Cc\0LKML <linux-kernel@vger.kernel.org>" - xfs@oss.sgi.com - Christoph Hellwig <hch@infradead.org> - Linux Memory Management List <linux-mm@kvack.org> + "Cc\0Christoph Hellwig <hch@infradead.org>" linux-fsdevel@vger.kernel.org + LKML <linux-kernel@vger.kernel.org> + Andrew Morton <akpm@linux-foundation.org> Tejun Heo <tj@kernel.org> - " Andrew Morton <akpm@linux-foundation.org>\0" + Linux Memory Management List <linux-mm@kvack.org> + " xfs@oss.sgi.com\0" "\00:1\0" "b\0" "On Thu, Jun 14, 2012 at 11:20:26AM +1000, Dave Chinner wrote:\n" @@ -222,11 +222,6 @@ " \t\t\treturn NULL;\n" " \n" "-- \n" - "1.7.10\n" - "\n" - "_______________________________________________\n" - "xfs mailing list\n" - "xfs@oss.sgi.com\n" - http://oss.sgi.com/mailman/listinfo/xfs + 1.7.10 -e53a858c6dd09135203198c13ee161724adc1a61f01eae735e5e65c97b3e24b2 +bfef97a1f78be285d05b88c8116f033b80282ec19cba93c7c3b1217926919a42
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.