The patch titled
node-hotplug-register-cpu-remove-node-struct-tidy
has been added to the -mm tree. Its filename is
node-hotplug-register-cpu-remove-node-struct-tidy.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: node-hotplug-register-cpu-remove-node-struct-tidy
From: Andrew Morton <akpm@xxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
Cc: Ashok Raj <ashok.raj@xxxxxxxxx>
Cc: Dave Hansen <haveblue@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/base/node.c | 6 ++----
include/linux/cpu.h | 4 ++--
2 files changed, 4 insertions(+), 6 deletions(-)
diff -puN drivers/base/node.c~node-hotplug-register-cpu-remove-node-struct-tidy drivers/base/node.c
--- 25/drivers/base/node.c~node-hotplug-register-cpu-remove-node-struct-tidy Wed May 24 13:03:41 2006
+++ 25-akpm/drivers/base/node.c Wed May 24 13:03:41 2006
@@ -198,9 +198,8 @@ struct node node_devices[MAX_NUMNODES];
*/
int register_cpu_under_node(unsigned int cpu, unsigned int nid)
{
- struct sys_device *obj;
if (node_online(nid)) {
- obj = get_cpu_sysdev(cpu);
+ struct sys_device *obj = get_cpu_sysdev(cpu);
if (!obj)
return 0;
return sysfs_create_link(&node_devices[nid].sysdev.kobj,
@@ -213,9 +212,8 @@ int register_cpu_under_node(unsigned int
int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
{
- struct sys_device *obj;
if (node_online(nid)) {
- obj = get_cpu_sysdev(cpu);
+ struct sys_device *obj = get_cpu_sysdev(cpu);
if (!obj)
return 0;
return sysfs_remove_link(&node_devices[nid].sysdev.kobj,
diff -puN include/linux/cpu.h~node-hotplug-register-cpu-remove-node-struct-tidy include/linux/cpu.h
--- 25/include/linux/cpu.h~node-hotplug-register-cpu-remove-node-struct-tidy Wed May 24 13:03:41 2006
+++ 25-akpm/include/linux/cpu.h Wed May 24 13:03:41 2006
@@ -31,10 +31,10 @@ struct cpu {
struct sys_device sysdev;
};
-extern int register_cpu(struct cpu *, int);
+extern int register_cpu(struct cpu *cpu, int num);
extern struct sys_device *get_cpu_sysdev(unsigned cpu);
#ifdef CONFIG_HOTPLUG_CPU
-extern void unregister_cpu(struct cpu *);
+extern void unregister_cpu(struct cpu *cpu);
#endif
struct notifier_block;
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.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
acpi-dock-driver-interface-fixups.patch
acpi-atlas-acpi-driver-v2-tidy.patch
remove-for_each_cpu.patch
sony_apci-resume.patch
uninorth-agp-warning-fixes.patch
alpha-agp-warning-fix.patch
kauditd_thread-warning-fix.patch
powernow-k8-crash-workaround.patch
scx200_acb-use-pci-i-o-resource-when-appropriate-fix.patch
git-gfs2.patch
git-infiniband.patch
via-pmu-add-input-device-tidy.patch
git-klibc.patch
git-klibc-build-hacks.patch
git-klibc-stdint-build-fix.patch
git-klibc-stdint-build-fix-2.patch
git-hdrcleanup-fixup.patch
git-hdrcleanup-vs-git-klibc-on-ia64.patch
git-hdrcleanup-vs-git-klibc-on-ia64-2.patch
git-hdrinstall-fixup.patch
git-libata-all.patch
libata-reduce-timeouts.patch
sdhci-truncated-pointer-fix.patch
git-mtd.patch
git-mtd-fixup.patch
git-netdev-all.patch
smc911x-Kconfig-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
git-nfs-fixup.patch
git-powerpc.patch
powerpc-kbuild-warning-fix.patch
git-rbtree.patch
git-sas.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
kconfigurable-resources-core-changes-i386-fix.patch
kconfigurable-resources-core-changes-fix.patch
kconfigurable-resources-arch-dependent-changes-arch-a-i-fix.patch
typesh-sector_t-and-blkcnt_t-arent-for-userspace.patch
kconfigurable-resources-mtd-fixes.patch
areca-raid-linux-scsi-driver-update6-for-2617-rc1-mm3-externs-go-in-headers.patch
git-scsi-target-fixup.patch
git-scsi-target-warning-fix.patch
revert-gregkh-usb-usb-ohci-avoids-root-hub-timer-polling.patch
gregkh-usb-usb-serial-mos7720-powerpc-wrokaround.patch
git-supertrak-fixup.patch
x86_64-mm-i386-numa-summit-check-fix.patch
revert-x86_64-mm-profile-pc-fp.patch
x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit-fix.patch
xfs-sparc32-build-fix.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
catch-valid-mem-range-at-onlining-memory-fix.patch
mm-introduce-remap_vmalloc_range-fix.patch
node-hotplug-register-cpu-remove-node-struct-tidy.patch
page-migration-simplify-migrate_pages-tweaks.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
x86-kernel-irq-balancer-fix-tidy.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-tidy.patch
dont-use-flush_tlb_all-in-suspend-time-tidy.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
connector-exports.patch
config_net=n-build-fix.patch
jbd-split-checkpoint-lists-tidy.patch
mark-address_space_operations-const-fix.patch
mark-address_space_operations-const-fix-2.patch
rewritten-backlight-infrastructure-for-portable-apple-computers-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy.patch
deprecate-smbfs-in-favour-of-cifs.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates-updates-2.patch
ufs-right-block-allocation-fixes.patch
ufs-change-block-number-on-the-fly-tweaks.patch
msnd-section-fix.patch
openpromfs-factorize-out-tidy.patch
add-driver-for-arm-amba-pl031-rtc-tidy.patch
add-export_unused_symbol-and-export_unused_symbol_gpl-default.patch
kernel-sysc-cleanups-fix.patch
add-a-sysfs-file-to-determine-if-a-kexec-kernel-is-loaded-tidy.patch
cpqarray-section-fix.patch
pdflush-handle-resume-wakeups.patch
schedule_on_each_cpu-reduce-kmalloc-size.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays-warning-fix.patch
add-via-hw-rng-driver-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
swap-prefetch-fix-lru_cache_add_tail-tidy.patch
pi-futex-futex-code-cleanups-fix.patch
document-futex-pi-design-fix-fix.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix.patch
namespaces-utsname-implement-utsname-namespaces-export.patch
namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch
reiser4.patch
ide_dma_speed-fixes-warning-fix.patch
ide_dma_speed-fixes-tidy.patch
hpt3xx-rework-rate-filtering-tidy.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
genirq-rename-desc-handler-to-desc-chip-power-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix-2.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
-
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
