The patch titled
pgdat-allocation-for-new-node-add-specify-node-id-fix-2
has been removed from the -mm tree. Its filename is
pgdat-allocation-for-new-node-add-specify-node-id-fix-2.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Andrew Morton <akpm@xxxxxxxx>
- Remove old add_memory() prototype
- Fix acpi_memhotplug.c
Cc: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
Cc: Dave Hansen <haveblue@xxxxxxxxxx>
Cc: "Brown, Len" <len.brown@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/acpi/acpi_memhotplug.c | 5 ++---
include/linux/memory_hotplug.h | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
diff -puN include/linux/memory_hotplug.h~pgdat-allocation-for-new-node-add-specify-node-id-fix-2 include/linux/memory_hotplug.h
--- devel/include/linux/memory_hotplug.h~pgdat-allocation-for-new-node-add-specify-node-id-fix-2 2006-04-26 22:17:12.000000000 -0700
+++ devel-akpm/include/linux/memory_hotplug.h 2006-04-26 22:17:12.000000000 -0700
@@ -109,7 +109,6 @@ static inline int __remove_pages(struct
return -ENOSYS;
}
-extern int add_memory(int nid, u64 start, u64 size);
extern int arch_add_memory(int nid, u64 start, u64 size);
extern int remove_memory(u64 start, u64 size);
diff -puN drivers/acpi/acpi_memhotplug.c~pgdat-allocation-for-new-node-add-specify-node-id-fix-2 drivers/acpi/acpi_memhotplug.c
--- devel/drivers/acpi/acpi_memhotplug.c~pgdat-allocation-for-new-node-add-specify-node-id-fix-2 2006-04-26 22:17:12.000000000 -0700
+++ devel-akpm/drivers/acpi/acpi_memhotplug.c 2006-04-26 22:17:12.000000000 -0700
@@ -245,7 +245,7 @@ static int acpi_memory_enable_device(str
continue;
}
- result = add_memory(node, info->start_addr, info->length);
+ result = arch_add_memory(node, info->start_addr, info->length);
if (result)
continue;
info->enabled = 1;
@@ -253,7 +253,7 @@ static int acpi_memory_enable_device(str
}
if (!num_enabled) {
- ACPI_ERROR((AE_INFO, "add_memory failed"));
+ ACPI_ERROR((AE_INFO, "arch_add_memory failed"));
mem_device->state = MEMORY_INVALID_STATE;
return -EINVAL;
}
@@ -452,7 +452,6 @@ static int acpi_memory_device_start (str
mem_device = acpi_driver_data(device);
if (!acpi_memory_check_device(mem_device)) {
- /* call add_memory func */
result = acpi_memory_enable_device(mem_device);
if (result)
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
config_net=n-build-fix.patch
request_irq-remove-warnings-from-irq-probing.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
remove-for_each_cpu.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
vivi-build-fix.patch
git-dvb-compat-build-fix.patch
bt866-build-fix.patch
git-dvb-Kconfig-fix.patch
connector-exports.patch
opencores-i2c-bus-driver-tidy.patch
git-gfs2.patch
git-libata-all.patch
git-mtd.patch
git-netdev-all.patch
smc911x-Kconfig-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
git-powerpc.patch
powerpc-pseries-avoid-crash-in-pci-code-if-mem-system-not-up-tidy.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
git-scsi-misc.patch
git-scsi-rc-fixes.patch
enable-advansys-driver.patch
advansys-warning-workaround.patch
scsi-clean-up-warnings-in-advansys-driver-fix.patch
fix-sco-on-some-bluetooth-adapters-tidy.patch
git-watchdog.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
read-write-migration-entries-make-mprotect-convert-write-migration-fix.patch
read-write-migration-entries-make-mprotect-convert-write-migration-fix-fix.patch
read-write-migration-entries-make-mprotect-convert-write-migration-fix-fix-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-powerpc-fix.patch
pgdat-allocation-for-new-node-add-specify-node-id-tidy.patch
pgdat-allocation-for-new-node-add-specify-node-id-fix-2.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-refresh-node_data-fix.patch
pgdat-allocation-for-new-node-add-export-kswapd-start-func-tidy.patch
mm-introduce-remap_vmalloc_range-fix.patch
acx1xx-wireless-driver.patch
x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy.patch
s390-dasd-device-identifiers-fix.patch
prune_one_dentry-tweaks.patch
mmput-might-sleep.patch
jbd-avoid-kfree-null.patch
ext3_clear_inode-avoid-kfree-null.patch
leds-amstrad-delta-led-support-tidy.patch
percpu-counter-data-type-changes-to-suppport-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
pi-futex-futex-code-cleanups-fix.patch
reiser4.patch
savagefb-add-state-save-and_restore-hooks-tidy.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
