Hi Florian,
On 13.03.2017 18:08, Florian Fainelli wrote:
On 03/13/2017 06:33 AM, Marcin Nowakowski wrote:
Since the introduction of GENERIC_CPU_AUTOPROBE
(https://patchwork.linux-mips.org/patch/15395/) we've got 2 very similarily
named headers: cpu-features.h and cpufeature.h.
Since the latter is used by all platforms that implement
GENERIC_CPU_AUTOPROBE functionality, it's better to rename the MIPS-specific
cpu-features.h.
Marcin Nowakowski (2):
MIPS: mach-rm: Remove recursive include of cpu-feature-overrides.h
MIPS: rename cpu-features.h -> cpucaps.h
That's a lot of churn that could cause some good headaches in
backporting stable changes affecting cpu-feature-overrides.h.
Can we just do the cpu-features.h -> cpucaps.h rename and keep
cpu-feature-overrides.h around?
That's of course possible, but I think it would make the naming quite
confusing as well, as it would be very unclear for any reader as to why
a 'cpu-feature-overrides' overrides 'cpucaps'.
I've looked at the change history of these files and most receive very
little updates (which is hardly surprising given the changes are done
mostly during initial integration of a new cpu or soon after), and none
of the changes in those files were marked for stable. I think it's safe
to assume that this pattern is not likely to change, would you agree?
Marcin
arch/mips/dec/setup.c | 2 +-
arch/mips/dec/time.c | 2 +-
arch/mips/include/asm/atomic.h | 2 +-
arch/mips/include/asm/bitops.h | 2 +-
arch/mips/include/asm/branch.h | 2 +-
arch/mips/include/asm/cacheflush.h | 2 +-
arch/mips/include/asm/{cpu-features.h => cpucaps.h} | 8 ++++----
arch/mips/include/asm/dsp.h | 2 +-
arch/mips/include/asm/fpu.h | 2 +-
arch/mips/include/asm/highmem.h | 2 +-
arch/mips/include/asm/io.h | 2 +-
.../mach-ath25/{cpu-feature-overrides.h => cpucaps-overrides.h} | 8 ++++----
.../mach-ath79/{cpu-feature-overrides.h => cpucaps-overrides.h} | 8 ++++----
.../mach-au1x00/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../mach-bcm47xx/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../mach-bcm63xx/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../mach-bmips/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../{cpu-feature-overrides.h => cpucaps-overrides.h} | 4 ++--
.../mach-cobalt/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../asm/mach-dec/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../mach-generic/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../mach-ip22/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../mach-ip27/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../mach-ip28/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../mach-ip32/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../mach-jz4740/{cpu-feature-overrides.h => cpucaps-overrides.h} | 4 ++--
.../falcon/{cpu-feature-overrides.h => cpucaps-overrides.h} | 8 ++++----
.../{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../mach-malta/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../mach-pic32/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../mt7620/{cpu-feature-overrides.h => cpucaps-overrides.h} | 8 ++++----
.../mt7621/{cpu-feature-overrides.h => cpucaps-overrides.h} | 8 ++++----
.../rt288x/{cpu-feature-overrides.h => cpucaps-overrides.h} | 8 ++++----
.../rt305x/{cpu-feature-overrides.h => cpucaps-overrides.h} | 8 ++++----
.../rt3883/{cpu-feature-overrides.h => cpucaps-overrides.h} | 8 ++++----
.../mach-rc32434/{cpu-feature-overrides.h => cpucaps-overrides.h} | 8 ++++----
.../asm/mach-rm/{cpu-feature-overrides.h => cpucaps-overrides.h} | 8 +++-----
.../mach-sibyte/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
.../mach-tx49xx/{cpu-feature-overrides.h => cpucaps-overrides.h} | 6 +++---
arch/mips/include/asm/r4kcache.h | 2 +-
arch/mips/include/asm/switch_to.h | 2 +-
arch/mips/include/asm/timex.h | 2 +-
arch/mips/include/asm/tlb.h | 2 +-
arch/mips/kernel/branch.c | 2 +-
arch/mips/kernel/cpu-probe.c | 2 +-
arch/mips/kernel/elf.c | 2 +-
arch/mips/kernel/proc.c | 2 +-
arch/mips/kernel/signal.c | 2 +-
arch/mips/kernel/signal_n32.c | 2 +-
arch/mips/kernel/smp-bmips.c | 2 +-
arch/mips/kernel/sysrq.c | 2 +-
arch/mips/kernel/time.c | 2 +-
arch/mips/kernel/uprobes.c | 2 +-
arch/mips/mm/c-octeon.c | 2 +-
arch/mips/mm/c-r4k.c | 2 +-
arch/mips/mm/cache.c | 2 +-
arch/mips/mm/gup.c | 2 +-
arch/mips/net/bpf_jit.c | 2 +-
arch/mips/netlogic/common/time.c | 2 +-
arch/mips/pistachio/irq.c | 2 +-
63 files changed, 135 insertions(+), 137 deletions(-)
rename arch/mips/include/asm/{cpu-features.h => cpucaps.h} (99%)
rename arch/mips/include/asm/mach-ath25/{cpu-feature-overrides.h => cpucaps-overrides.h} (86%)
rename arch/mips/include/asm/mach-ath79/{cpu-feature-overrides.h => cpucaps-overrides.h} (85%)
rename arch/mips/include/asm/mach-au1x00/{cpu-feature-overrides.h => cpucaps-overrides.h} (91%)
rename arch/mips/include/asm/mach-bcm47xx/{cpu-feature-overrides.h => cpucaps-overrides.h} (93%)
rename arch/mips/include/asm/mach-bcm63xx/{cpu-feature-overrides.h => cpucaps-overrides.h} (87%)
rename arch/mips/include/asm/mach-bmips/{cpu-feature-overrides.h => cpucaps-overrides.h} (64%)
rename arch/mips/include/asm/mach-cavium-octeon/{cpu-feature-overrides.h => cpucaps-overrides.h} (94%)
rename arch/mips/include/asm/mach-cobalt/{cpu-feature-overrides.h => cpucaps-overrides.h} (90%)
rename arch/mips/include/asm/mach-dec/{cpu-feature-overrides.h => cpucaps-overrides.h} (95%)
rename arch/mips/include/asm/mach-generic/{cpu-feature-overrides.h => cpucaps-overrides.h} (61%)
rename arch/mips/include/asm/mach-ip22/{cpu-feature-overrides.h => cpucaps-overrides.h} (88%)
rename arch/mips/include/asm/mach-ip27/{cpu-feature-overrides.h => cpucaps-overrides.h} (92%)
rename arch/mips/include/asm/mach-ip28/{cpu-feature-overrides.h => cpucaps-overrides.h} (88%)
rename arch/mips/include/asm/mach-ip32/{cpu-feature-overrides.h => cpucaps-overrides.h} (89%)
rename arch/mips/include/asm/mach-jz4740/{cpu-feature-overrides.h => cpucaps-overrides.h} (92%)
rename arch/mips/include/asm/mach-lantiq/falcon/{cpu-feature-overrides.h => cpucaps-overrides.h} (85%)
rename arch/mips/include/asm/mach-loongson64/{cpu-feature-overrides.h => cpucaps-overrides.h} (89%)
rename arch/mips/include/asm/mach-malta/{cpu-feature-overrides.h => cpucaps-overrides.h} (92%)
rename arch/mips/include/asm/mach-netlogic/{cpu-feature-overrides.h => cpucaps-overrides.h} (88%)
rename arch/mips/include/asm/mach-paravirt/{cpu-feature-overrides.h => cpucaps-overrides.h} (83%)
rename arch/mips/include/asm/mach-pic32/{cpu-feature-overrides.h => cpucaps-overrides.h} (82%)
rename arch/mips/include/asm/mach-pmcs-msp71xx/{cpu-feature-overrides.h => cpucaps-overrides.h} (76%)
rename arch/mips/include/asm/mach-ralink/mt7620/{cpu-feature-overrides.h => cpucaps-overrides.h} (87%)
rename arch/mips/include/asm/mach-ralink/mt7621/{cpu-feature-overrides.h => cpucaps-overrides.h} (88%)
rename arch/mips/include/asm/mach-ralink/rt288x/{cpu-feature-overrides.h => cpucaps-overrides.h} (87%)
rename arch/mips/include/asm/mach-ralink/rt305x/{cpu-feature-overrides.h => cpucaps-overrides.h} (87%)
rename arch/mips/include/asm/mach-ralink/rt3883/{cpu-feature-overrides.h => cpucaps-overrides.h} (86%)
rename arch/mips/include/asm/mach-rc32434/{cpu-feature-overrides.h => cpucaps-overrides.h} (90%)
rename arch/mips/include/asm/mach-rm/{cpu-feature-overrides.h => cpucaps-overrides.h} (84%)
rename arch/mips/include/asm/mach-sibyte/{cpu-feature-overrides.h => cpucaps-overrides.h} (87%)
rename arch/mips/include/asm/mach-tx49xx/{cpu-feature-overrides.h => cpucaps-overrides.h} (74%)
