The patch titled pgdat-allocation-for-new-node-add-generic-alloc-node_data-tidy has been added to the -mm tree. Its filename is pgdat-allocation-for-new-node-add-generic-alloc-node_data-tidy.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this From: Andrew Morton <akpm@xxxxxxxx> Cc: Yasonori Goto <y-goto@xxxxxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Dave Hansen <haveblue@xxxxxxxxxx> Cc: "Brown, Len" <len.brown@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/linux/memory_hotplug.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff -puN include/linux/memory_hotplug.h~pgdat-allocation-for-new-node-add-generic-alloc-node_data-tidy include/linux/memory_hotplug.h --- devel/include/linux/memory_hotplug.h~pgdat-allocation-for-new-node-add-generic-alloc-node_data-tidy 2006-04-20 16:06:31.000000000 -0700 +++ devel-akpm/include/linux/memory_hotplug.h 2006-04-20 16:06:31.000000000 -0700 @@ -75,16 +75,16 @@ static inline int memofy_add_physaddr_to #ifdef CONFIG_HAVE_ARCH_NODEDATA_EXTENSION /* - * For supporint node-hotadd, we have to allocate new pgdat. + * For supporting node-hotadd, we have to allocate a new pgdat. * - * If an arch have generic style NODE_DATA(), - * node_data[nid] = kzalloc() works well . But it depends on each arch. + * If an arch has generic style NODE_DATA(), + * node_data[nid] = kzalloc() works well. But it depends on the architecture. * * In general, generic_alloc_nodedata() is used. * Now, arch_free_nodedata() is just defined for error path of node_hot_add. * */ -static inline pg_data_t * arch_alloc_nodedata(int nid) +static inline pg_data_t *arch_alloc_nodedata(int nid) { return NULL; } @@ -106,7 +106,7 @@ static inline void arch_free_nodedata(pg */ #define generic_alloc_nodedata(nid) \ ({ \ - (pg_data_t *)kzalloc(sizeof(pg_data_t), GFP_KERNEL); \ + kzalloc(sizeof(pg_data_t), GFP_KERNEL); \ }) /* * This definition is just for error path in node hotadd. _ Patches currently in -mm which might be from akpm@xxxxxxxx are origin.patch config_net=n-build-fix.patch git-acpi.patch acpi-update-asus_acpi-driver-registration-fix.patch acpi-memory-hotplug-cannot-manage-_crs-with-plural-resoureces.patch catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch sony_apci-resume.patch powernow-k8-crash-workaround.patch git-dvb.patch dvb-core-ule-fixes-and-rfc4326-additions-kernel-2616-tidy.patch sparc32-vivi-fix.patch git-dvb-compat-build-fix.patch bt866-build-fix.patch connector-exports.patch git-libata-all.patch git-mtd.patch pci-error-recovery-e1000-network-device-driver.patch git-net.patch gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch git-pcmcia.patch git-scsi-misc.patch megaraid-unused-variable.patch enable-advansys-driver.patch advansys-warning-workaround.patch scsi-clean-up-warnings-in-advansys-driver-fix.patch git-watchdog.patch arm-add_memory-build-fix.patch pg_uncached-is-ia64-only.patch migration-remove-unnecessary-pageswapcache-checks-fix.patch wait_table-and-zonelist-initializing-for-memory-hotadd-wait_table-initialization-fixes.patch preserve-write-permissions-in-migration-entries-fix.patch slab-cleanup-kmem_getpages-fix.patch slab-stop-using-list_for_each-fix.patch pgdat-allocation-for-new-node-add-specify-node-id-tidy.patch pgdat-allocation-for-new-node-add-get-node-id-by-acpi-tidy.patch pgdat-allocation-for-new-node-add-generic-alloc-node_data-tidy.patch pgdat-allocation-for-new-node-add-export-kswapd-start-func-tidy.patch acx1xx-wireless-driver.patch prune_one_dentry-tweaks.patch mmput-might-sleep.patch tpm-use-clear_bit-fix.patch tpm-use-clear_bit-fix-fix.patch tpm-use-clear_bit-fix-fix-fix-fix.patch hangcheck-remove-monotomic_clock-on-x86.patch pi-futex-futex-code-cleanups-fix.patch reiser4.patch kgdb-core-lite-add-reboot-command.patch kgdb-8250-fix.patch nr_blockdev_pages-in_interrupt-warning.patch device-suspend-debug.patch revert-tty-buffering-comment-out-debug-code.patch slab-leaks3-default-y.patch x86-kmap_atomic-debugging.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