diff for duplicates of <453796BC.8050600@shadowen.org> diff --git a/a/1.txt b/N1/1.txt index f7db562..52f6d17 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,7 @@ really not work for 32 bit. Good. > > - Kame -> = +> == > This patch maps sparsemem's *sparse* memmap into contiguous virtual address range > starting from virt_memmap_start. > @@ -48,7 +48,8 @@ conversion. Of course the same change could be applied there just as well. > 4 files changed, 104 insertions(+), 4 deletions(-) > > Index: linux-2.6.19-rc2/mm/Kconfig -> =================================> --- linux-2.6.19-rc2.orig/mm/Kconfig 2006-10-18 18:13:39.000000000 +0900 +> =================================================================== +> --- linux-2.6.19-rc2.orig/mm/Kconfig 2006-10-18 18:13:39.000000000 +0900 > +++ linux-2.6.19-rc2/mm/Kconfig 2006-10-18 18:14:07.000000000 +0900 > @@ -77,6 +77,14 @@ > def_bool y @@ -66,7 +67,8 @@ conversion. Of course the same change could be applied there just as well. > # Both the NUMA code and DISCONTIGMEM use arrays of pg_data_t's > # to represent different areas of memory. This variable allows > Index: linux-2.6.19-rc2/include/asm-generic/memory_model.h -> =================================> --- linux-2.6.19-rc2.orig/include/asm-generic/memory_model.h 2006-09-20 12:42:06.000000000 +0900 +> =================================================================== +> --- linux-2.6.19-rc2.orig/include/asm-generic/memory_model.h 2006-09-20 12:42:06.000000000 +0900 > +++ linux-2.6.19-rc2/include/asm-generic/memory_model.h 2006-10-18 18:14:07.000000000 +0900 > @@ -47,6 +47,7 @@ > }) @@ -80,7 +82,7 @@ with this namespace, and call this CONFIG_SPARSEMEM_VMEMMAP. > /* > * Note: section's mem_map is encorded to reflect its start_pfn. -> * section[i].section_mem_map = mem_map's address - start_pfn; +> * section[i].section_mem_map == mem_map's address - start_pfn; > @@ -62,6 +63,12 @@ > struct mem_section *__sec = __pfn_to_section(__pfn); \ > __section_mem_map_addr(__sec) + __pfn; \ @@ -104,7 +106,8 @@ out of my hat. > > #ifdef CONFIG_OUT_OF_LINE_PFN_TO_PAGE > Index: linux-2.6.19-rc2/include/linux/mmzone.h -> =================================> --- linux-2.6.19-rc2.orig/include/linux/mmzone.h 2006-10-18 18:13:39.000000000 +0900 +> =================================================================== +> --- linux-2.6.19-rc2.orig/include/linux/mmzone.h 2006-10-18 18:13:39.000000000 +0900 > +++ linux-2.6.19-rc2/include/linux/mmzone.h 2006-10-18 18:14:07.000000000 +0900 > @@ -599,6 +599,14 @@ > extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT]; @@ -129,7 +132,8 @@ sparse_vmemmap_setbase(). > { > if (!mem_section[SECTION_NR_TO_ROOT(nr)]) > Index: linux-2.6.19-rc2/mm/sparse.c -> =================================> --- linux-2.6.19-rc2.orig/mm/sparse.c 2006-09-20 12:42:06.000000000 +0900 +> =================================================================== +> --- linux-2.6.19-rc2.orig/mm/sparse.c 2006-09-20 12:42:06.000000000 +0900 > +++ linux-2.6.19-rc2/mm/sparse.c 2006-10-19 16:58:06.000000000 +0900 > @@ -9,7 +9,81 @@ > #include <linux/spinlock.h> @@ -149,7 +153,7 @@ sparse_vmemmap_setbase(). > +void *pte_alloc_vmemmap(int node) > +{ > + void *ret; -> + if (system_state = SYSTEM_BOOTING) { +> + if (system_state == SYSTEM_BOOTING) { > + ret = alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE); > + } else { > + ret = kmalloc_node(PAGE_SIZE, GFP_KERNEL, node); @@ -315,3 +319,9 @@ this would better be pgdat->node_id. > Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> -apw + +-- +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 4ea5144..19298e7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020061019172140.5a29962c.kamezawa.hiroyu@jp.fujitsu.com\0" "From\0Andy Whitcroft <apw@shadowen.org>\0" "Subject\0Re: [RFC] virtual memmap for sparsemem [1/2] arch independent part\0" - "Date\0Thu, 19 Oct 2006 15:16:12 +0000\0" + "Date\0Thu, 19 Oct 2006 16:16:12 +0100\0" "To\0KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>\0" "Cc\0Linux-MM <linux-mm@kvack.org>" linux-ia64@vger.kernel.org @@ -27,7 +27,7 @@ "\n" "> \n" "> - Kame\n" - "> =\n" + "> ==\n" "> This patch maps sparsemem's *sparse* memmap into contiguous virtual address range\n" "> starting from virt_memmap_start.\n" "> \n" @@ -58,7 +58,8 @@ "> 4 files changed, 104 insertions(+), 4 deletions(-)\n" "> \n" "> Index: linux-2.6.19-rc2/mm/Kconfig\n" - "> =================================> --- linux-2.6.19-rc2.orig/mm/Kconfig\t2006-10-18 18:13:39.000000000 +0900\n" + "> ===================================================================\n" + "> --- linux-2.6.19-rc2.orig/mm/Kconfig\t2006-10-18 18:13:39.000000000 +0900\n" "> +++ linux-2.6.19-rc2/mm/Kconfig\t2006-10-18 18:14:07.000000000 +0900\n" "> @@ -77,6 +77,14 @@\n" "> \tdef_bool y\n" @@ -76,7 +77,8 @@ "> # Both the NUMA code and DISCONTIGMEM use arrays of pg_data_t's\n" "> # to represent different areas of memory. This variable allows\n" "> Index: linux-2.6.19-rc2/include/asm-generic/memory_model.h\n" - "> =================================> --- linux-2.6.19-rc2.orig/include/asm-generic/memory_model.h\t2006-09-20 12:42:06.000000000 +0900\n" + "> ===================================================================\n" + "> --- linux-2.6.19-rc2.orig/include/asm-generic/memory_model.h\t2006-09-20 12:42:06.000000000 +0900\n" "> +++ linux-2.6.19-rc2/include/asm-generic/memory_model.h\t2006-10-18 18:14:07.000000000 +0900\n" "> @@ -47,6 +47,7 @@\n" "> })\n" @@ -90,7 +92,7 @@ "\n" "> /*\n" "> * Note: section's mem_map is encorded to reflect its start_pfn.\n" - "> * section[i].section_mem_map = mem_map's address - start_pfn;\n" + "> * section[i].section_mem_map == mem_map's address - start_pfn;\n" "> @@ -62,6 +63,12 @@\n" "> \tstruct mem_section *__sec = __pfn_to_section(__pfn);\t\\\n" "> \t__section_mem_map_addr(__sec) + __pfn;\t\t\\\n" @@ -114,7 +116,8 @@ "> \n" "> #ifdef CONFIG_OUT_OF_LINE_PFN_TO_PAGE\n" "> Index: linux-2.6.19-rc2/include/linux/mmzone.h\n" - "> =================================> --- linux-2.6.19-rc2.orig/include/linux/mmzone.h\t2006-10-18 18:13:39.000000000 +0900\n" + "> ===================================================================\n" + "> --- linux-2.6.19-rc2.orig/include/linux/mmzone.h\t2006-10-18 18:13:39.000000000 +0900\n" "> +++ linux-2.6.19-rc2/include/linux/mmzone.h\t2006-10-18 18:14:07.000000000 +0900\n" "> @@ -599,6 +599,14 @@\n" "> extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT];\n" @@ -139,7 +142,8 @@ "> {\n" "> \tif (!mem_section[SECTION_NR_TO_ROOT(nr)])\n" "> Index: linux-2.6.19-rc2/mm/sparse.c\n" - "> =================================> --- linux-2.6.19-rc2.orig/mm/sparse.c\t2006-09-20 12:42:06.000000000 +0900\n" + "> ===================================================================\n" + "> --- linux-2.6.19-rc2.orig/mm/sparse.c\t2006-09-20 12:42:06.000000000 +0900\n" "> +++ linux-2.6.19-rc2/mm/sparse.c\t2006-10-19 16:58:06.000000000 +0900\n" "> @@ -9,7 +9,81 @@\n" "> #include <linux/spinlock.h>\n" @@ -159,7 +163,7 @@ "> +void *pte_alloc_vmemmap(int node)\n" "> +{\n" "> +\tvoid *ret;\n" - "> +\tif (system_state = SYSTEM_BOOTING) {\n" + "> +\tif (system_state == SYSTEM_BOOTING) {\n" "> +\t\tret = alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE);\n" "> +\t} else {\n" "> +\t\tret = kmalloc_node(PAGE_SIZE, GFP_KERNEL, node);\n" @@ -324,6 +328,12 @@ "> see: http://www.linux-mm.org/ .\n" "> Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>\n" "\n" - -apw + "-apw\n" + "\n" + "--\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>" -50d3937a9f9f9936456fed767a8a3d44805cce7f5af7ead5eceb0ffc2bf4bbfc +604466e8a5a7eb8dad91af9ed75fb848a8d5fd80f6fa64ca1662beba414a9585
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.