Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752549AbbEDK2h (ORCPT ); Mon, 4 May 2015 06:28:37 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:34624 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751400AbbEDK2a (ORCPT ); Mon, 4 May 2015 06:28:30 -0400 From: Bartosz Golaszewski To: LKML Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, "Rafael J. Wysocki" , Viresh Kumar , Guenter Roeck , Jean Delvare , Fenghua Yu , Benoit Cousson , Jonathan Corbet , Oleg Drokin , Russell King , Catalin Marinas , Bartosz Golaszewski Subject: [PATCH v2 0/9] x86: remove cpu_**_mask() functions Date: Mon, 4 May 2015 12:28:15 +0200 Message-Id: <1430735304-14866-1-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3642 Lines: 75 Two functions defined in asm/smp.h: cpu_sibling_mask() and cpu_core_mask(), have the same functionality as macros defined in linux/topology.h: topology_thread_cpumask() and topology_core_cpumask() respectively. They are not documented and are architecture specific. Also: different naming for the same functionality (in case of cpu_sibling_mask() and topology_thread_cpumask()) is a bit misleading. This series makes all the callers switch to using the topology.h macros and removes their smp.h counterparts. While we're at it: rename topology_thread_cpumask() to topology_sibling_cpumask() to be consistent with the term used in the scheduler. The same duplication exists on powerpc. NOTE: patch 2/9 had been already submitted separately but didn't receive any attention, so I'm attaching it to this series. v2: - renamed topology_thread_cpumask() to topology_sibling_cpumask() - updated Documentation/cputopology.txt v1: https://lkml.org/lkml/2015/4/30/188 Bartosz Golaszewski (9): topology: rename topology_thread_cpumask() Documentation: update cputopology.txt coretemp: replace cpu_sibling_mask() with topology_sibling_cpumask() powernow-k8: replace cpu_core_mask() with topology_core_cpumask() p4-clockmod: replace cpu_sibling_mask() with topology_sibling_cpumask() acpi-cpufreq: replace cpu_**_mask() with topology_**_cpumask() speedstep-ich: replace cpu_sibling_mask() with topology_sibling_cpumask() x86: replace cpu_**_mask() with topology_**_cpumask() x86: remove cpu_sibling_mask() and cpu_core_mask() Documentation/cputopology.txt | 37 +++++++++++++------ arch/arm/include/asm/topology.h | 2 +- arch/arm64/include/asm/topology.h | 2 +- arch/ia64/include/asm/topology.h | 2 +- arch/mips/include/asm/topology.h | 2 +- arch/powerpc/include/asm/topology.h | 2 +- arch/powerpc/mm/tlb_nohash.c | 2 +- arch/s390/include/asm/topology.h | 3 +- arch/sparc/include/asm/topology_64.h | 2 +- arch/tile/include/asm/topology.h | 2 +- arch/x86/include/asm/smp.h | 10 ------ arch/x86/include/asm/topology.h | 2 +- arch/x86/kernel/cpu/perf_event_intel.c | 6 ++-- arch/x86/kernel/cpu/proc.c | 3 +- arch/x86/kernel/smpboot.c | 42 +++++++++++----------- arch/x86/kernel/tsc_sync.c | 2 +- block/blk-mq-cpumap.c | 2 +- drivers/acpi/acpi_pad.c | 2 +- drivers/base/topology.c | 2 +- drivers/cpufreq/acpi-cpufreq.c | 5 +-- drivers/cpufreq/p4-clockmod.c | 2 +- drivers/cpufreq/powernow-k8.c | 13 ++----- drivers/cpufreq/speedstep-ich.c | 2 +- drivers/hwmon/coretemp.c | 3 +- drivers/net/ethernet/sfc/efx.c | 2 +- .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 2 +- drivers/staging/lustre/lustre/ptlrpc/service.c | 4 +-- include/linux/topology.h | 6 ++-- lib/cpu_rmap.c | 2 +- 29 files changed, 87 insertions(+), 81 deletions(-) -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/