The patch titled memory-hotplug-fix-a-bug-on-dev-mem-for-64-bit-kernels-fix has been added to the -mm tree. Its filename is memory-hotplug-fix-a-bug-on-dev-mem-for-64-bit-kernels-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: memory-hotplug-fix-a-bug-on-dev-mem-for-64-bit-kernels-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> simplify comment Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Li Haicheng <haicheng.li@xxxxxxxxx> Cc: Shaohui Zheng <shaohui.zheng@xxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Wu Fengguang <fengguang.wu@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/mm/init_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN arch/x86/mm/init_64.c~memory-hotplug-fix-a-bug-on-dev-mem-for-64-bit-kernels-fix arch/x86/mm/init_64.c --- a/arch/x86/mm/init_64.c~memory-hotplug-fix-a-bug-on-dev-mem-for-64-bit-kernels-fix +++ a/arch/x86/mm/init_64.c @@ -617,8 +617,8 @@ void __init paging_init(void) */ #ifdef CONFIG_MEMORY_HOTPLUG /* - * After memory hotplug, the variables max_pfn, max_low_pfn and high_memory will - * be affected, they will be updated in this function. + * After memory hotplug the variables max_pfn, max_low_pfn and high_memory need + * updating. */ static void update_end_of_memory_vars(u64 start, u64 size) { _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are linux-next.patch next-remove-localversion.patch i-need-old-gcc.patch revert-input-wistron_btns-switch-to-using-sparse-keymap-library.patch drivers-media-video-cx23885-needs-kfifo-conversion.patch memory-hotplug-fix-a-bug-on-dev-mem-for-64-bit-kernels-fix.patch ibmphp-read-the-length-of-ebda-and-map-entire-ebda-region-fix.patch pci-update-pci_set_vga_state-to-call-arch-functions-fix.patch cpufreq-ondemand-dont-synchronize-sample-rate-unless-mulitple-cpus-present-checkpatch-fixes.patch drivers-gpu-drm-radeon-radeon_combiosc-fix-warning.patch drivers-media-video-pmsc-needs-versionh.patch radio-add-the-saa7706h-car-radio-dsp-to-v4l2-chip-identh-fix.patch timer-stats-fix-del_timer_sync-and-try_to_del_timer_sync.patch jffs2-avoid-using-c-keyword-new-in-userspace-visible-header.patch 3x59x-fix-pci-resource-management.patch drivers-bluetooth-btusbc-add-tdk-corp-integrated-bluetooth-support.patch mm-avoid-false-sharing-of-mm_counter-checkpatch-fixes.patch mm-count-swap-usage-checkpatch-fixes.patch mm-add-lowmem-detection-logic-fix.patch mm-count-lowmem-rss-checkpatch-fixes.patch vmscan-check-high-watermark-after-shrink-zone-fix.patch mm-remove-function-free_hot_page-fix.patch mm-restore-zone-all_unreclaimable-to-independence-word-fix.patch memory-hotplug-create-sys-firmware-memmap-entry-for-new-memory-fix.patch include-linux-fsh-convert-fmode_-constants-to-hex.patch mm-change-anon_vma-linking-to-fix-multi-process-server-scalability-issue-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch uml-linec-avoid-null-pointer-dereference-simplify.patch resources-introduce-generic-page_is_ram-fix.patch lib-more-scalable-list_sort-fix.patch mm-pass-mm-flags-as-a-coredump-parameter-for-consistency-fix.patch memcg-move-charges-of-anonymous-page-cleanup.patch memcg-implement-memory-thresholds-checkpatch-fixes.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command-checkpatch-fixes.patch reiser4-export-remove_from_page_cache-fix.patch reiser4.patch reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.patch fs-reiser4-contextc-current_is_pdflush-got-removed.patch reiser4-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch notify_change-callers-must-hold-i_mutex.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html