)]}' { "log": [ { "commit": "d4bbf7e7759afc172e2bfbc5c416324590049cdd", "tree": "7eab5ee5481cd3dcf1162329fec827177640018a", "parents": [ "a150439c4a97db379f0ed6faa46fbbb6e7bf3cb2", "401d0069cb344f401bc9d264c31db55876ff78c0" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Nov 28 09:46:22 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Nov 28 09:46:22 2011 -0800" }, "message": "Merge branch \u0027master\u0027 into x86/memblock\n\nConflicts \u0026 resolutions:\n\n* arch/x86/xen/setup.c\n\n\tdc91c728fd \"xen: allow extra memory to be in multiple regions\"\n\t24aa07882b \"memblock, x86: Replace memblock_x86_reserve/free...\"\n\n\tconflicted on xen_add_extra_mem() updates. The resolution is\n\ttrivial as the latter just want to replace\n\tmemblock_x86_reserve_range() with memblock_reserve().\n\n* drivers/pci/intel-iommu.c\n\n\t166e9278a3f \"x86/ia64: intel-iommu: move to drivers/iommu/\"\n\t5dfe8660a3d \"bootmem: Replace work_with_active_regions() with...\"\n\n\tconflicted as the former moved the file under drivers/iommu/.\n\tResolved by applying the chnages from the latter on the moved\n\tfile.\n\n* mm/Kconfig\n\n\t6661672053a \"memblock: add NO_BOOTMEM config symbol\"\n\tc378ddd53f9 \"memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option\"\n\n\tconflicted trivially. Both added config options. Just\n\tletting both add their own options resolves the conflict.\n\n* mm/memblock.c\n\n\td1f0ece6cdc \"mm/memblock.c: small function definition fixes\"\n\ted7b56a799c \"memblock: Remove memblock_memory_can_coalesce()\"\n\n\tconfliected. The former updates function removed by the\n\tlatter. Resolution is trivial.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "b95f1b31b75588306e32b2afd32166cad48f670b", "tree": "b5496144e41b117cfe5ae70b145b5351709ec4d0", "parents": [ "b9e15bafdf1aa20791cdefdcbf1ccf7d7aa03aaa" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Oct 16 02:01:52 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 09:20:12 2011 -0400" }, "message": "mm: Map most files to use export.h instead of module.h\n\nThe files changed within are only using the EXPORT_SYMBOL\nmacro variants. They are not using core modular infrastructure\nand hence don\u0027t need module.h but only the export.h header.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "24aa07882b672fff2da2f5c955759f0bd13d32d5", "tree": "e6dad38048ede1dbb9ad3c7fffcc4b37e72274a8", "parents": [ "c378ddd53f9b8832a46fd4fec050a97fc2269858" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jul 12 11:16:06 2011 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Thu Jul 14 11:47:53 2011 -0700" }, "message": "memblock, x86: Replace memblock_x86_reserve/free_range() with generic ones\n\nOther than sanity check and debug message, the x86 specific version of\nmemblock reserve/free functions are simple wrappers around the generic\nversions - memblock_reserve/free().\n\nThis patch adds debug messages with caller identification to the\ngeneric versions and replaces x86 specific ones and kills them.\narch/x86/include/asm/memblock.h and arch/x86/mm/memblock.c are empty\nafter this change and removed.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nLink: http://lkml.kernel.org/r/1310462166-31469-14-git-send-email-tj@kernel.org\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "8a9ca34c11e1695dab7aff3cfa7780fbfe76b2f8", "tree": "5bd341215c7e829b89d1fcb481cfff71ef81f0f5", "parents": [ "64a02daacbc880bac1d6b3aeefbcd226a9341fa7" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jul 12 11:16:02 2011 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Thu Jul 14 11:47:49 2011 -0700" }, "message": "memblock, x86: Replace __get_free_all_memory_range() with for_each_free_mem_range()\n\n__get_free_all_memory_range() walks memblock, calculates free memory\nareas and fills in the specified range. It can be easily replaced\nwith for_each_free_mem_range().\n\nConvert free_low_memory_core_early() and\nadd_highpages_with_active_regions() to for_each_free_mem_range().\nThis leaves __get_free_all_memory_range() without any user. Kill it\nand related functions.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nLink: http://lkml.kernel.org/r/1310462166-31469-10-git-send-email-tj@kernel.org\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "64a02daacbc880bac1d6b3aeefbcd226a9341fa7", "tree": "d87b71baee631aaeb7b34b53ed24f716ad06f056", "parents": [ "8d89ac808417e92a33fb5fa3c86352016643775a" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jul 12 11:16:01 2011 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Thu Jul 14 11:47:49 2011 -0700" }, "message": "memblock, x86: Make free_all_memory_core_early() explicitly free lowmem only\n\nnomemblock is currently used only by x86 and on x86_32\nfree_all_memory_core_early() silently freed only the low mem because\nget_free_all_memory_range() in arch/x86/mm/memblock.c implicitly\nlimited range to max_low_pfn.\n\nRename free_all_memory_core_early() to free_low_memory_core_early()\nand make it call __get_free_all_memory_range() and limit the range to\nmax_low_pfn explicitly. This makes things clearer and also is\nconsistent with the bootmem behavior.\n\nThis leaves get_free_all_memory_range() without any user. Kill it.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nLink: http://lkml.kernel.org/r/1310462166-31469-9-git-send-email-tj@kernel.org\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "eb40c4c27f1722f058e4713ccfedebac577d5190", "tree": "b471a4451c7cab125b3aafced4c77c7958fd711d", "parents": [ "e64980405cc6aa74ef178d8d9aa4018c867ceed1" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jul 12 10:46:35 2011 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Thu Jul 14 11:45:35 2011 -0700" }, "message": "memblock, x86: Replace memblock_x86_find_in_range_node() with generic memblock calls\n\nWith the previous changes, generic NUMA aware memblock API has feature\nparity with memblock_x86_find_in_range_node(). There currently are\ntwo users - x86 setup_node_data() and __alloc_memory_core_early() in\nnobootmem.c.\n\nThis patch converts the former to use memblock_alloc_nid() and the\nlatter memblock_find_range_in_node(), and kills\nmemblock_x86_find_in_range_node() and related functions including\nfind_memory_early_core_early() in page_alloc.c.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nLink: http://lkml.kernel.org/r/1310460395-30913-9-git-send-email-tj@kernel.org\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "1f5026a7e21e409c2b9dd54f6dfb9446511fb7c5", "tree": "bcf0529d5f05ea8b685d6c0fddcb3197c2fab49c", "parents": [ "348968eb151e2569ad0ebe19b2f9c3c25b5c816a" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jul 12 09:58:09 2011 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Wed Jul 13 16:36:01 2011 -0700" }, "message": "memblock: Kill MEMBLOCK_ERROR\n\n25818f0f28 (memblock: Make MEMBLOCK_ERROR be 0) thankfully made\nMEMBLOCK_ERROR 0 and there already are codes which expect error return\nto be 0. There\u0027s no point in keeping MEMBLOCK_ERROR around. End its\nmisery.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nLink: http://lkml.kernel.org/r/1310457490-3356-6-git-send-email-tj@kernel.org\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "4eb317072be81bd93906f768679f745bc574e6b7", "tree": "74558ef8caca65ddf62fd93030dae44b5e51535c", "parents": [ "8bba154ef29e16331e578029e9050c74b87b7ff9" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Tue May 24 17:12:38 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:39:31 2011 -0700" }, "message": "memblock/nobootmem: remove unneeded code from alloc_bootmem_node_high()\n\nThe bootmem wrapper with memblock supports top-down now, so we no longer\nneed this trick.\n\nSigned-off-by: Yinghai LU \u003cyinghai@kernel.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Olaf Hering \u003colaf@aepfle.de\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "93a72052be81823fa1584b9be037d51924f9efa4", "tree": "4f5c824c8fe3fb737e27b91bfd60c10d092dc3e9", "parents": [ "8547727756a7322b99aa313ce50fe15d8f858872" ], "author": { "name": "Olaf Hering", "email": "olaf@aepfle.de", "time": "Wed Mar 23 16:43:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 23 19:47:19 2011 -0700" }, "message": "crash_dump: export is_kdump_kernel to modules, consolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn\n\nThe Xen PV drivers in a crashed HVM guest can not connect to the dom0\nbackend drivers because both frontend and backend drivers are still in\nconnected state. To run the connection reset function only in case of a\ncrashdump, the is_kdump_kernel() function needs to be available for the PV\ndriver modules.\n\nConsolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn into\nkernel/crash_dump.c Also export elfcorehdr_addr to make is_kdump_kernel()\nusable for modules.\n\nLeave \u0027elfcorehdr\u0027 as early_param(). This changes powerpc from __setup()\nto early_param(). It adds an address range check from x86 also on ia64\nand powerpc.\n\n[akpm@linux-foundation.org: additional #includes]\n[akpm@linux-foundation.org: remove elfcorehdr_addr export]\n[akpm@linux-foundation.org: fix for Tejun\u0027s mm/nobootmem.c changes]\nSigned-off-by: Olaf Hering \u003colaf@aepfle.de\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8bc1f91e1f0e977fb95b11d8fa686f5091888110", "tree": "e7c6369b20e5e37176b91a93a8ea621df8c9d893", "parents": [ "e782ab421bbba1912c87934bd0e8998630736418" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Thu Feb 24 14:43:06 2011 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Feb 24 14:43:06 2011 +0100" }, "message": "bootmem: Move __alloc_memory_core_early() to nobootmem.c\n\nNow that bootmem.c and nobootmem.c are separate, there\u0027s no reason to\ndefine __alloc_memory_core_early(), which is used only by nobootmem,\ninside #ifdef in page_alloc.c. Move it to nobootmem.c and make it\nstatic.\n\nThis patch doesn\u0027t introduce any behavior change.\n\n-tj: Updated commit description.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nAcked-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "e782ab421bbba1912c87934bd0e8998630736418", "tree": "496e4ccaeadf3551d4c516b9f36c7c087eef9e3b", "parents": [ "0932587328d9bd5b500a640fbaff3290c8d4cabf" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Thu Feb 24 14:43:06 2011 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Feb 24 14:43:06 2011 +0100" }, "message": "bootmem: Move contig_page_data definition to bootmem.c/nobootmem.c\n\nNow that bootmem.c and nobootmem.c are separate, it\u0027s cleaner to\ndefine contig_page_data in each file than in page_alloc.c with #ifdef.\nMove it.\n\nThis patch doesn\u0027t introduce any behavior change.\n\n-v2: According to Andrew, fixed the struct layout.\n-tj: Updated commit description.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nAcked-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "0932587328d9bd5b500a640fbaff3290c8d4cabf", "tree": "7c041a41db88f7bb6d98f2a69e21a33a311b469f", "parents": [ "2bf50555b0920be7e29d3823f6bbd20ee5920489" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Thu Feb 24 14:43:05 2011 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Feb 24 14:43:05 2011 +0100" }, "message": "bootmem: Separate out CONFIG_NO_BOOTMEM code into nobootmem.c\n\nmm/bootmem.c contained code paths for both bootmem and no bootmem\nconfigurations. They implement about the same set of APIs in\ndifferent ways and as a result bootmem.c contains massive amount of\n#ifdef CONFIG_NO_BOOTMEM.\n\nSeparate out CONFIG_NO_BOOTMEM code into mm/nobootmem.c. As the\ncommon part is relatively small, duplicate them in nobootmem.c instead\nof creating a common file or ifdef\u0027ing in bootmem.c.\n\nThe followings are duplicated.\n\n* {min|max}_low_pfn, max_pfn, saved_max_pfn\n* free_bootmem_late()\n* ___alloc_bootmem()\n* __alloc_bootmem_low()\n\nThe followings are applicable only to nobootmem and moved verbatim.\n\n* __free_pages_memory()\n* free_all_memory_core_early()\n\nThe followings are not applicable to nobootmem and omitted in\nnobootmem.c.\n\n* reserve_bootmem_node()\n* reserve_bootmem()\n\nThe rest split function bodies according to CONFIG_NO_BOOTMEM.\n\nMakefile is updated so that only either bootmem.c or nobootmem.c is\nbuilt according to CONFIG_NO_BOOTMEM.\n\nThis patch doesn\u0027t introduce any behavior change.\n\n-tj: Rewrote commit description.\n\nSuggested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nAcked-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" } ] }