The patch titled
catch-valid-mem-range-at-onlining-memory-tidy
has been added to the -mm tree. Its filename is
catch-valid-mem-range-at-onlining-memory-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: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/ioport.h | 6 ++----
kernel/resource.c | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)
diff -puN include/linux/ioport.h~catch-valid-mem-range-at-onlining-memory-tidy include/linux/ioport.h
--- 25/include/linux/ioport.h~catch-valid-mem-range-at-onlining-memory-tidy Fri Apr 28 16:36:06 2006
+++ 25-akpm/include/linux/ioport.h Fri Apr 28 16:36:06 2006
@@ -103,12 +103,10 @@ extern int allocate_resource(struct reso
void (*alignf)(void *, struct resource *,
u64, u64),
void *alignf_data);
-int adjust_resource(struct resource *res, u64 start,
- u64 size);
-#ifdef CONFIG_MEMORY_HOTPLUG
+int adjust_resource(struct resource *res, u64 start, u64 size);
+
/* get registered SYSTEM_RAM resources in specified area */
extern int find_next_system_ram(struct resource *res);
-#endif
/* Convenience shorthand with allocation */
#define request_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name))
diff -puN kernel/resource.c~catch-valid-mem-range-at-onlining-memory-tidy kernel/resource.c
--- 25/kernel/resource.c~catch-valid-mem-range-at-onlining-memory-tidy Fri Apr 28 16:36:06 2006
+++ 25-akpm/kernel/resource.c Fri Apr 28 16:36:06 2006
@@ -249,7 +249,7 @@ int find_next_system_ram(struct resource
end = res->end;
read_lock(&resource_lock);
- for( p = iomem_resource.child; p ; p = p->sibling) {
+ for (p = iomem_resource.child; p ; p = p->sibling) {
/* system ram is just marked as IORESOURCE_MEM */
if (p->flags != res->flags)
continue;
@@ -268,7 +268,6 @@ int find_next_system_ram(struct resource
res->end = p->end;
return 0;
}
-
#endif
/*
_
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
remove-for_each_cpu.patch
sony_apci-resume.patch
powernow-k8-crash-workaround.patch
git-dvb.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
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
pci-add-pci_assign_resource_fixed-allow-fixed-address-fix.patch
git-scsi-misc.patch
git-scsi-rc-fixes.patch
areca-raid-linux-scsi-driver-update6-for-2617-rc1-mm3-externs-go-in-headers.patch
enable-advansys-driver.patch
advansys-warning-workaround.patch
git-watchdog.patch
pg_uncached-is-ia64-only.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-3.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
catch-valid-mem-range-at-onlining-memory-tidy.patch
mm-introduce-remap_vmalloc_range-fix.patch
acx1xx-wireless-driver.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
connector-exports.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
profile-likely-unlikely-macros-tidy.patch
profile-likely-unlikely-macros-fix.patch
profile-likely-unlikely-macros-fix-2.patch
exit-dont-call-sleeping-things-when-oopsing.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
