The patch titled allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy has been removed from the -mm tree. Its filename is allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy.patch This patch was dropped because it was folded into another patch ------------------------------------------------------ Subject: allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy 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 15:19:05.000000000 -0700 +++ devel-akpm/arch/ia64/kernel/module.c 2006-05-11 15:19:05.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 15:19:05.000000000 -0700 +++ devel-akpm/include/asm-ia64/percpu.h 2006-05-11 15:19:05.000000000 -0700 @@ -45,7 +45,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 15:19:05.000000000 -0700 +++ devel-akpm/kernel/module.c 2006-05-11 15:19:05.000000000 -0700 @@ -416,11 +416,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 powernow-k8-crash-workaround.patch revert-powernow-k8-crash-workaround.patch git-acpi.patch reapply-powernow-k8-crash-workaround.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 remove-for_each_cpu.patch sony_apci-resume.patch git-agpgart.patch kauditd_thread-warning-fix.patch git-block.patch git-cifs.patch git-cpufreq-fixup.patch git-dvb.patch git-gfs2.patch git-infiniband.patch git-input.patch git-intelfb.patch git-klibc.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 revert-sata_sil24-sii3124-sata-driver-endian-problem.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 git-netdev-all-fixup.patch myri10ge-alpha-build-fix.patch smc911x-Kconfig-fix.patch forcedeth-typecast-cleanup.patch git-net.patch git-net-git-klibc-fixup.patch git-nfs-fixup.patch git-powerpc.patch powerpc-kbuild-warning-fix.patch git-rbtree.patch git-sas.patch revert-gregkh-pci-pci-test-that-drivers-properly-call-pci_set_master.patch gregkh-pci-kconfigurable-resources-arch-dependent-changes-arm-fix.patch kconfigurable-resources-mtd-fixes.patch git-pcmcia-fixup.patch megaraid_sas-add-support-for-zcr-controller-fix.patch areca-raid-linux-scsi-driver.patch git-scsi-target-warning-fix.patch git-scsi-target-fixup.patch git-supertrak-fixup.patch revert-x86_64-mm-spinlock-short.patch x86_64-mm-moving-phys_proc_id-and-cpu_core_id-to-cpuinfo_x86-warning-fix.patch pg_uncached-is-ia64-only.patch fix-update_mmu_cache-in-fremapc-fix.patch initialise-total_memory-earlier.patch page-migration-simplify-migrate_pages-tweaks.patch page-migration-support-moving-of-individual-pages-x86-support-fix.patch zoned-vm-counters-per-zone-counter-functionality-tidy.patch acx1xx-wireless-driver.patch tiacx-pci-build-fix.patch tiacx-ia64-fix.patch x86-kernel-irq-balancer-fix-tidy.patch i386-moving-phys_proc_id-and-cpu_core_id-to-cpuinfo_x86-warning-fix.patch vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-tidy.patch vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-arch_vma_name-fix.patch vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386.patch vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386-2.patch vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386-2-revert-maxmem-change.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 rewritten-backlight-infrastructure-for-portable-apple-computers-fix.patch allow-for-per-cpu-data-being-in-tdata-and-tbss-sections.patch allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy.patch deprecate-smbfs-in-favour-of-cifs.patch ufs-printk-warning-fixes.patch msnd-section-fix.patch openpromfs-factorize-out-tidy.patch add-export_unused_symbol-and-export_unused_symbol_gpl-default.patch kernel-sysc-cleanups-fix.patch cpqarray-section-fix.patch pdflush-handle-resume-wakeups.patch schedule_on_each_cpu-reduce-kmalloc-size.patch load_module-cleanup.patch ax88796-parallel-port-driver-build-fix.patch keys-fix-race-between-two-instantiators-of-a-key-tidy.patch for_each_cpu_mask-warning-fix.patch add-max6902-rtc-support-tidy.patch add-v3020-rtc-support-tidy.patch at91rm9200-rtc-driver-tidy.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 sched-fix-smt-nice-lock-contention-and-optimization-tidy.patch swap-prefetch-fix-lru_cache_add_tail-tidy.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-use-init_utsname-when-appropriate-cifs-update.patch namespaces-utsname-implement-utsname-namespaces-export.patch namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch namespaces-utsname-sysctl-hack-cleanup-2-fix.patch readahead-sysctl-parameters-fix.patch make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch reiser4-hardirq-include-fix.patch reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.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 au1100fb-add-power-management-support-tidy.patch lib-add-idr_replace-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 genirq-convert-the-i386-architecture-to-irq-chips-fix-2.patch lock-validator-beautify-x86_64-stacktraces-fix.patch lock-validator-beautify-x86_64-stacktraces-fix-4.patch lock-validator-stacktrace-build-fix.patch lock-validator-stacktrace-warning-fix.patch lock-validator-irqtrace-core-powerpc-fix-1.patch lock-validator-irqtrace-core-non-x86-fix.patch lock-validator-irqtrace-core-non-x86-fix-2.patch lock-validator-irqtrace-core-non-x86-fix-3.patch lock-validator-add-per_cpu_offset-fix.patch lock-validator-core-multichar-fix.patch lock-validator-prove-rwsem-locking-correctness-fix.patch lock-validator-prove-rwsem-locking-correctness-powerpc-fix.patch lock-validator-special-locking-serial-fix.patch lock-validator-special-locking-sb-s_umount-fix.patch lock-validator-enable-lock-validator-in-kconfig-not-yet.patch lockdep-x86-only.patch lockdep-really-x86-only.patch lockdep-really-really-x86-only.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