The patch titled cleanup arch/i386/kernel/smpboot.c:smp_tune_scheduling() has been added to the -mm tree. Its filename is cleanup-arch-i386-kernel-smpbootcsmp_tune_scheduling.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: cleanup arch/i386/kernel/smpboot.c:smp_tune_scheduling() From: Adrian Bunk <bunk@xxxxxxxxx> - remove the write-only local variable "bandwidth" - don't set "max_cache_size" in the (cachesize < 0) case: that's already handled in kernel/sched.c:measure_migration_cost() Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Acked-by: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/i386/kernel/smpboot.c | 29 +++++------------------------ 1 files changed, 5 insertions(+), 24 deletions(-) diff -puN arch/i386/kernel/smpboot.c~cleanup-arch-i386-kernel-smpbootcsmp_tune_scheduling arch/i386/kernel/smpboot.c --- a/arch/i386/kernel/smpboot.c~cleanup-arch-i386-kernel-smpbootcsmp_tune_scheduling +++ a/arch/i386/kernel/smpboot.c @@ -972,34 +972,15 @@ exit: } #endif -static void smp_tune_scheduling (void) +static void smp_tune_scheduling(void) { unsigned long cachesize; /* kB */ - unsigned long bandwidth = 350; /* MB/s */ - /* - * Rough estimation for SMP scheduling, this is the number of - * cycles it takes for a fully memory-limited process to flush - * the SMP-local cache. - * - * (For a P5 this pretty much means we will choose another idle - * CPU almost always at wakeup time (this is due to the small - * L1 cache), on PIIs it's around 50-100 usecs, depending on - * the cache size) - */ - if (!cpu_khz) { - /* - * this basically disables processor-affinity - * scheduling on SMP without a TSC. - */ - return; - } else { + if (cpu_khz) { cachesize = boot_cpu_data.x86_cache_size; - if (cachesize == -1) { - cachesize = 16; /* Pentiums, 2x8kB cache */ - bandwidth = 100; - } - max_cache_size = cachesize * 1024; + + if (cachesize > 0) + max_cache_size = cachesize * 1024; } } _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch make-drivers-acpi-baycdrive_bays-static.patch make-drivers-acpi-eccec_ecdt-static.patch drivers-acpi-oslc-fix-a-null-check.patch git-alsa.patch sound-soc-soc-dapmc-make-4-functions-static.patch git-dvb.patch git-gfs2-nmw.patch fs-dlm-lowcomms-tcpc-remove-2-functions.patch git-mtd.patch make-drivers-mtd-cmdlinepartcmtdpart_setup-static.patch git-net.patch net-possible-cleanups.patch net-possible-cleanups-fix.patch net-possible-cleanups-fix-2.patch net-uninline-skb_put-fix.patch git-ocfs2.patch git-scsi-misc.patch drivers-scsi-small-cleanups.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-advansysc-cleanups.patch megaraid-fix-warnings-when-config_proc_fs=n.patch drivers-scsi-dpt_i2oc-remove-dead-code.patch drivers-scsi-aic7xxx-make-functions-static.patch make-qla2x00_reg_remote_port-static.patch arch-i386-kernel-remove-remaining-pc98-code.patch cleanup-arch-i386-kernel-smpbootcsmp_tune_scheduling.patch git-cryptodev.patch make-mm-thrashcglobal_faults-static.patch acx1xx-wireless-driver.patch drivers-edac-make-code-static.patch remove-drivers-pci-searchcpci_find_device_reverse.patch ext4_ext_split-remove-dead-code.patch the-scheduled-removal-of-some-oss-options.patch make-mm-shmemcshmem_xattr_security_handler-static.patch remove-kernel-lockdepclockdep_internal.patch make-kernel-signalckill_proc_info-static.patch make-ecryptfs_version_str_map-static.patch make-fs-jbd-transactionc__journal_temp_unlink_buffer-static.patch make-fs-jbd2-transactionc__jbd2_journal_temp_unlink_buffer-static.patch fs-lockd-hostc-make-2-functions-static.patch make-fs-proc-basecproc_pid_instantiate-static.patch make-ext2_get_blocks-static.patch generic-bug-implementation-include-linux-bugh-must-always-include-linux-moduleh.patch drivers-mtd-nand-rtc_from4c-use-lib-bitrevc.patch fsstack-introduce-fsstack_copy_attrinode_-fs-stackc-should-include-linux-fs_stackh.patch i4l-remove-the-broken-hisax_amd7930-option.patch readahead-events-accounting-make-readahead_debug_level-static.patch reiser4-export-remove_from_page_cache-fix.patch fs-reiser4-possible-cleanups.patch reiser4-possible-cleanups-2.patch fs-reiser4-possible-cleanups-2.patch fs-reiser4-more-possible-cleanups.patch make-drivers-md-dm-snapcksnapd-static.patch gtod-persistent-clock-support-core-remove-kernel-timercwall_jiffies.patch gtod-persistent-clock-support-i386-i386-unexport-read_persistent_clock.patch dynticks-extend-next_timer_interrupt-to-use-a-reference-jiffie-make-kernel-timerc__next_timer_interrupt-static.patch updated-i386-convert-to-clock-event-devices-arch-i386-kernel-apicc-make-a-function-static.patch updated-i386-convert-to-clock-event-devices-remove-arch-i386-kernel-time_hpetchpet_reenable.patch slim-main-patch-security-slim-slm_mainc-make-2-functions-static.patch slab-cache-shrinker-statistics.patch debug-shared-irqs-kconfig-fix.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.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