The patch titled
Replace ARCH_HAS_SCHED_WAKE_IDLE with CONFIG_SCHED_SMT
has been added to the -mm tree. Its filename is
replace-arch_has_sched_wake_idle-with-config_sched_smt.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Replace ARCH_HAS_SCHED_WAKE_IDLE with CONFIG_SCHED_SMT
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Replace ARCH_HAS_SCHED_WAKE_IDLE with CONFIG_SCHED_SMT. Move it from header
files to Kconfig space.
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/topology.h | 6 ++----
kernel/sched.c | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff -puN include/linux/topology.h~replace-arch_has_sched_wake_idle-with-config_sched_smt include/linux/topology.h
--- a/include/linux/topology.h~replace-arch_has_sched_wake_idle-with-config_sched_smt
+++ a/include/linux/topology.h
@@ -80,10 +80,8 @@
* and allow arch-specific performance tuning of sched_domains.
*/
#ifdef CONFIG_SCHED_SMT
-/* MCD - Do we really need this? It is always on if CONFIG_SCHED_SMT is,
- * so can't we drop this in favor of CONFIG_SCHED_SMT?
- */
-#define ARCH_HAS_SCHED_WAKE_IDLE
+/* CONFIG_SCHED_SMT is synonymous with old ARCH_HAS_SCHED_WAKE_IDLE */
+
/* Common values for SMT siblings */
#ifndef SD_SIBLING_INIT
#define SD_SIBLING_INIT (struct sched_domain) { \
diff -puN kernel/sched.c~replace-arch_has_sched_wake_idle-with-config_sched_smt kernel/sched.c
--- a/kernel/sched.c~replace-arch_has_sched_wake_idle-with-config_sched_smt
+++ a/kernel/sched.c
@@ -1315,7 +1315,7 @@ nextlevel:
*
* Returns the CPU we should wake onto.
*/
-#if defined(ARCH_HAS_SCHED_WAKE_IDLE)
+#ifdef CONFIG_SCHED_SMT
static int wake_idle(int cpu, struct task_struct *p)
{
cpumask_t tmp;
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
acpi-bus-add-missing-newline.patch
acpi-handle-firmware_register-init-errors.patch
acpi-scan-handle-kset-kobject-errors.patch
acpi-fix-printk-format-warnings.patch
sysfs_remove_bin_file-no-return-value-dump_stack-on.patch
kobject-must_check-fixes.patch
drivers-base-check-errors.patch
sysfs-add-proper-sysfs_init-prototype.patch
bttv-must_check-fixes.patch
git-lxdialog.patch
pcmcia-ds-must_check-fixes.patch
libsas-externs-not-needed.patch
pcie-check-and-return-bus_register-errors.patch
pcie-check-and-return-bus_register-errors-fix.patch
git-scsi-misc.patch
aic7-cleanup-module_parm_desc-strings.patch
dc395x-fix-printk-format-warning.patch
add-kerneldocs-for-some-functions-in-mm-memoryc.patch
tiacx-sparse-cleanups.patch
consistently-use-max_errno-in-__syscall_return.patch
consistently-use-max_errno-in-__syscall_return-fix.patch
eisa-bus-modalias-attributes-support-1.patch
kernel-params-must_check-fixes.patch
blockdevc-check-errors.patch
block-handle-subsystem_register-init-errors.patch
fs-namespace-handle-init-registration-errors.patch
kernel-doc-for-relay-interface.patch
kernel-doc-fixes-for-debugfs.patch
kernel-doc-move-filesystems-together.patch
include-documentation-for-functions-in-drivers-base-classc.patch
fix-parameter-names-in-drivers-base-classc.patch
fix-kerneldoc-comments-in-kernel-timerc-fix.patch
replace-arch_has_sched_wake_idle-with-config_sched_smt.patch
replace-__arch_has_do_softirq-with.patch
replace-arch_has_read_current_timer-with.patch
replace-arch_has_nmi_watchdog-with.patch
replace-arch_has_flush_anon_page-with.patch
replace-arch_has_socket_types-with.patch
replace-arch_has_valid_phys_addr_range-with.patch
replace-__arch_has_no_page_zero_mapped-with.patch
replace-arch_has_power_init-with-config_acpi_power_init.patch
ecryptfs-fix-printk-format-warnings.patch
ide-core-must_check-fixes.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
