The patch titled
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy
has been added to the -mm tree. Its filename is
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-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>
Be consistent about naming.
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/ia64/kernel/module.c | 2 +-
include/asm-ia64/percpu.h | 2 +-
kernel/module.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff -puN arch/ia64/kernel/module.c~allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy arch/ia64/kernel/module.c
--- devel/arch/ia64/kernel/module.c~allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy 2006-05-11 04:11:01.000000000 -0700
+++ devel-akpm/arch/ia64/kernel/module.c 2006-05-11 04:11:01.000000000 -0700
@@ -944,7 +944,7 @@ module_arch_cleanup (struct module *mod)
#ifdef CONFIG_SMP
void
-percpu_modcopy (void *pcpudst, const void *src, unsigned long size,
+percpu_modcopy(void *pcpudst, const void *src, unsigned long size,
unsigned long zero_size)
{
unsigned int i;
diff -puN include/asm-ia64/percpu.h~allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy include/asm-ia64/percpu.h
--- devel/include/asm-ia64/percpu.h~allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy 2006-05-11 04:11:01.000000000 -0700
+++ devel-akpm/include/asm-ia64/percpu.h 2006-05-11 04:11:01.000000000 -0700
@@ -46,7 +46,7 @@ DECLARE_PER_CPU(unsigned long, local_per
#define __raw_get_cpu_var(var) (*RELOC_HIDE(&per_cpu__##var, __ia64_per_cpu_var(local_per_cpu_offset)))
extern void percpu_modcopy(void *pcpudst, const void *src,
- unsigned long init_sz, unsigned long zero_sz);
+ unsigned long size, unsigned long zero_size);
extern void setup_per_cpu_areas (void);
extern void *per_cpu_init(void);
diff -puN kernel/module.c~allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy kernel/module.c
--- devel/kernel/module.c~allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy 2006-05-11 04:11:01.000000000 -0700
+++ devel-akpm/kernel/module.c 2006-05-11 04:11:01.000000000 -0700
@@ -415,11 +415,11 @@ static inline void find_pcpusecs(Elf_Ehd
pcpuindex[1] = 0;
}
static inline void percpu_modcopy(void *pcpudst, const void *src,
- unsigned long init_sz, unsigned long zero_sz)
+ unsigned long size, unsigned long zero_size)
{
/* there should be no per-cpu data to copy or clear */
- BUG_ON(init_sz != 0);
- BUG_ON(zero_sz != 0);
+ BUG_ON(size != 0);
+ BUG_ON(zero_size != 0);
}
#endif /* CONFIG_SMP */
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
autofs4-nfy_none-wait-race-fix-tidy.patch
setup_per_zone_pages_min-overflow-fix.patch
deprecate-smbfs-in-favour-of-cifs.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
s3c24xx-hardware-spi-driver-tidy.patch
git-dvb.patch
git-gfs2.patch
via-pmu-add-input-device-tidy.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
git-rbtree.patch
git-sas.patch
git-serial.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
kconfigurable-resources-arch-dependent-changes-arch-a-i-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
git-watchdog.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
tracking-dirty-pages-in-shared-mappings-v4-fix.patch
throttle-writers-of-shared-mappings-tidy.patch
acx1xx-wireless-driver.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
percpu-counter-data-type-changes-to-suppport-fix.patch
connector-exports.patch
config_net=n-build-fix.patch
jbd-split-checkpoint-lists-tidy.patch
improve-randomness-of-hash_long-on-64bit-tidy.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy.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
-
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
