consolidate a few more arch support config options
Subsystems (24)
Hi all,
this series moves various config options that are defined in multiple arch Kconfig files into common files, usually close to the code supporting such features.
PATCH 1/11 powerpc: remove dead ifdefs in <asm/checksum.h>
__KERNEL__ is never not defined for non-uapi headers, and GENERIC_CSUM isn't ever set for powerpc either.
--- arch/powerpc/include/asm/checksum.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
arch/powerpc/include/asm/checksum.h +1 -7
@@ -1,6 +1,5 @@#ifndef _ASM_POWERPC_CHECKSUM_H#define _ASM_POWERPC_CHECKSUM_H -#ifdef __KERNEL__/* * This program is free software; you can redistribute it and/or
@@ -9,9 +8,6 @@* 2 of the License, or (at your option) any later version. */ -#ifdef CONFIG_GENERIC_CSUM -#include <asm-generic/checksum.h> -#else #include <linux/bitops.h> #include <linux/in6.h> /*
@@ -217,6 +213,4 @@ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,const struct in6_addr *daddr, __u32 len, __u8 proto, __wsum sum); -#endif -#endif /* __KERNEL__ */ -#endif +#endif /* _ASM_POWERPC_CHECKSUM_H */
Signature · 1 line
2.20.1
Re: [PATCH 01/11] powerpc: remove dead ifdefs in <asm/checksum.h>
Le 13/02/2019 à 18:39, Christoph Hellwig a écrit :
Quoted 2 lines
__KERNEL__is never not defined for non-uapi headers, andGENERIC_CSUMisn't ever set for powerpc either.
GENERIC_CSUM was abandonned by commit d4fde568a34a ("powerpc/64: Use optimized checksum routines on little-endian")
Could you also remove the 'config GENERIC_CSUM' item in arch/powerpc/Kconfig ?
Christophe
Quoted 36 lines
Signed-off-by Christoph Hellwig <[email protected]>--- arch/powerpc/include/asm/checksum.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)arch/powerpc/include/asm/checksum.h +1
-7@@ -1,6 +1,5 @@#ifndef _ASM_POWERPC_CHECKSUM_H#define _ASM_POWERPC_CHECKSUM_H -#ifdef __KERNEL__/* * This program is free software; you can redistribute it and/or @@ -9,9 +8,6 @@* 2 of the License, or (at your option) any later version. */ -#ifdef CONFIG_GENERIC_CSUM -#include <asm-generic/checksum.h> -#else #include <linux/bitops.h> #include <linux/in6.h> /* @@ -217,6 +213,4 @@ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,const struct in6_addr *daddr, __u32 len, __u8 proto, __wsum sum); -#endif -#endif /* __KERNEL__ */ -#endif +#endif /* _ASM_POWERPC_CHECKSUM_H */
Re: [PATCH 01/11] powerpc: remove dead ifdefs in <asm/checksum.h>
Quoted 2 lines · Christophe Leroy
Could you also remove the 'config
GENERIC_CSUM' item inarch/powerpc/Kconfig?
All the separate declarations go away later in this series.
Re: [PATCH 01/11] powerpc: remove dead ifdefs in <asm/checksum.h>
Le 14/02/2019 à 18:05, Christoph Hellwig a écrit :
Quoted 6 lines · Christophe Leroy
Quoted 2 lines
Could you also remove the 'config
GENERIC_CSUM' item inarch/powerpc/Kconfig?All the separate declarations go away later in this series.
I saw, but the purpose of the later patch is to replace arch defined GENERIC_CSUM by a common one that arches select. For the powerpc you are not in that case as the powerpc does not select GENERIC_CSUM.
So I really believe that all stale bits of remaining GENERIC_CSUM in powerpc should go away as a single dedicated patch, as a fix of commit d4fde568a34a ("powerpc/64: Use optimized checksum routines on little-endian")
Regarding the #ifdef __KERNEL__ , I think we should do a wide cleanup in arch/powerpc/include/asm, not only asm/checksum.h
Christophe
Re: [PATCH 01/11] powerpc: remove dead ifdefs in <asm/checksum.h>
Quoted 20 lines · Christophe Leroy
Quoted 6 lines · Christoph Hellwig
Quoted 2 lines · Christophe Leroy
Could you also remove the 'config
GENERIC_CSUM' item inarch/powerpc/Kconfig?All the separate declarations go away later in this series.
I saw, but the purpose of the later patch is to replace arch defined
GENERIC_CSUMby a common one that arches select. For the powerpc you are not in that case as the powerpc does not selectGENERIC_CSUM.So I really believe that all stale bits of remaining
GENERIC_CSUMin powerpc should go away as a single dedicated patch, as a fix of commitd4fde568a34a("powerpc/64: Use optimized checksum routines on little-endian")
Quoted 4 lines
Regarding the #ifdef
__KERNEL__, I think we should do a wide cleanup inarch/powerpc/include/asm, not onlyasm/checksum.hChristophe
Please send such cleanups to PowerPC ML
instead of to me (Kbuild).
Christoph,
I think this one is independent of the rest of this series. How about separating it if you volunteer to Powerpc cleansup?
Signature · 2 lines
Best Regards Masahiro Yamada
Re: [PATCH 01/11] powerpc: remove dead ifdefs in <asm/checksum.h>
In reply to Christoph HellwigQuoted 1 line · Christoph Hellwig
__KERNEL__is never not defined for non-uapi headers, andGENERIC_CSUM
"... never not ... non-..." That's a bit too negative, I think. :-)
Andreas.
Signature · 3 lines
Andreas Schwab, SUSE Labs, [email protected] GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."
PATCH 2/11 riscv: remove the HAVE_KPROBES option
In reply to Christoph HellwigHAVE_KPROBES is defined genericly in arch/Kconfig and architectures should just select it if supported.
--- arch/riscv/Kconfig | 3 --- 1 file changed, 3 deletions(-)
arch/riscv/Kconfig +0 -3
@@ -94,9 +94,6 @@ config PGTABLE_LEVELS default 3 if 64BIT default 2 -config HAVE_KPROBES - def_bool n - menu "Platform type" choice
Signature · 1 line
2.20.1
Re: [PATCH 02/11] riscv: remove the HAVE_KPROBES option
Quoted 5 lines · Christoph Hellwig
HAVE_KPROBESis defined genericly inarch/Kconfigand architectures should just select it if supported.Signed-off-by Christoph Hellwig <[email protected]>
Do you want this patch picked up by me?
Or, by Palmer?
Quoted 26 lines
--- arch/riscv/Kconfig | 3 --- 1 file changed, 3 deletions(-)arch/riscv/Kconfig +0
-4@@ -94,9 +94,6 @@ config PGTABLE_LEVELS default 3 if 64BIT default 2 -config HAVE_KPROBES - def_bool n - menu "Platform type" choice --2.20.1
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Signature · 2 lines
Best Regards Masahiro Yamada
Re: [PATCH 02/11] riscv: remove the HAVE_KPROBES option
Quoted 10 lines · Masahiro Yamada
Quoted 5 lines · Christoph Hellwig
HAVE_KPROBESis defined genericly inarch/Kconfigand architectures should just select it if supported.Signed-off-by Christoph Hellwig <[email protected]>Do you want this patch picked up by me?
Or, by Palmer?
Given that I don't think I'll have the rest of this series respun in time for this merge window: Palmer, can you pick it up?
Re: [PATCH 02/11] riscv: remove the HAVE_KPROBES option
Quoted 6 lines · Christoph Hellwig
Quoted 5 lines · Masahiro Yamada
Quoted 4 lines · Christoph Hellwig
HAVE_KPROBESis defined genericly inarch/Kconfigand architectures should just select it if supported.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Christoph Hellwig <[email protected]>Do you want this patch picked up by me?
Or, by Palmer?
Given that I don't think I'll have the rest of this series respun in time for this merge window: Palmer, can you pick it up?
It's on my for-next.
PATCH 3/11 kernel/locks: consolidate RWSEM_GENERIC_* options
In reply to Christoph HellwigIntroduce one central definition of RWSEM_XCHGADD_ALGORITHM and RWSEM_GENERIC_SPINLOCK in kernel/Kconfig.locks and let architectures select RWSEM_XCHGADD_ALGORITHM if they want it, otherwise default to the spinlock version.
--- arch/alpha/Kconfig | 8 +------- arch/arc/Kconfig | 3 --- arch/arm/Kconfig | 5 +---- arch/arm64/Kconfig | 4 +--- arch/c6x/Kconfig | 3 --- arch/csky/Kconfig | 3 --- arch/h8300/Kconfig | 3 --- arch/hexagon/Kconfig | 7 +------ arch/ia64/Kconfig | 5 +---- arch/m68k/Kconfig | 7 ------- arch/microblaze/Kconfig | 6 ------ arch/mips/Kconfig | 7 ------- arch/nds32/Kconfig | 3 --- arch/nios2/Kconfig | 3 --- arch/openrisc/Kconfig | 6 ------ arch/parisc/Kconfig | 6 ------ arch/powerpc/Kconfig | 8 +------- arch/riscv/Kconfig | 3 --- arch/s390/Kconfig | 7 +------ arch/sh/Kconfig | 6 ------ arch/sparc/Kconfig | 9 +-------- arch/unicore32/Kconfig | 6 ------ arch/x86/Kconfig | 4 +--- arch/x86/um/Kconfig | 7 +------ arch/xtensa/Kconfig | 4 +--- kernel/Kconfig.locks | 7 +++++++ 26 files changed, 18 insertions(+), 122 deletions(-)
arch/alpha/Kconfig +1 -7
@@ -35,6 +35,7 @@ config ALPHA select MODULES_USE_ELF_RELA select ODD_RT_SIGACTION select OLD_SIGSUSPEND + select RWSEM_XCHGADD_ALGORITHM select CPU_NO_EFFICIENT_FFS if !ALPHA_EV67 help The Alpha is a 64-bit general-purpose processor designed and
@@ -49,13 +50,6 @@ config MMU bool default y -config RWSEM_GENERIC_SPINLOCK - bool - -config RWSEM_XCHGADD_ALGORITHM - bool - default y - config ARCH_HAS_ILOG2_U32 bool default n
arch/arc/Kconfig +0 -3
@@ -63,9 +63,6 @@ config SCHED_OMIT_FRAME_POINTER config GENERIC_CSUM def_bool y -config RWSEM_GENERIC_SPINLOCK - def_bool y - config ARCH_DISCONTIGMEM_ENABLE def_bool n
arch/arm/Kconfig +1 -4
@@ -108,6 +108,7 @@ config ARM select PERF_USE_VMALLOC select REFCOUNT_FULL select RTC_LIB + select RWSEM_XCHGADD_ALGORITHM select SYS_SUPPORTS_APM_EMULATION # Above selects are sorted alphabetically; please add new ones # according to that. Thanks.
@@ -176,10 +177,6 @@ config TRACE_IRQFLAGS_SUPPORT bool default !CPU_V7M -config RWSEM_XCHGADD_ALGORITHM - bool - default y - config ARCH_HAS_ILOG2_U32 bool
arch/arm64/Kconfig +1 -3
@@ -170,6 +170,7 @@ config ARM64 select POWER_RESET select POWER_SUPPLY select REFCOUNT_FULL + select RWSEM_XCHGADD_ALGORITHM select SPARSE_IRQ select SWIOTLB select SYSCTL_EXCEPTION_TRACE
@@ -238,9 +239,6 @@ config LOCKDEP_SUPPORT config TRACE_IRQFLAGS_SUPPORT def_bool y -config RWSEM_XCHGADD_ALGORITHM - def_bool y - config GENERIC_BUG def_bool y depends on BUG
arch/c6x/Kconfig +0 -3
@@ -26,9 +26,6 @@ config MMU config FPU def_bool n -config RWSEM_GENERIC_SPINLOCK - def_bool y - config GENERIC_CALIBRATE_DELAY def_bool y
arch/csky/Kconfig +0 -3
@@ -93,9 +93,6 @@ config GENERIC_HWEIGHT config MMU def_bool y -config RWSEM_GENERIC_SPINLOCK - def_bool y - config STACKTRACE_SUPPORT def_bool y
arch/h8300/Kconfig +0 -3
@@ -26,9 +26,6 @@ config H8300 config CPU_BIG_ENDIAN def_bool y -config RWSEM_GENERIC_SPINLOCK - def_bool y - config GENERIC_HWEIGHT def_bool y
arch/hexagon/Kconfig +1 -6
@@ -31,6 +31,7 @@ config HEXAGON select GENERIC_CLOCKEVENTS_BROADCAST select MODULES_USE_ELF_RELA select GENERIC_CPU_DEVICES + select RWSEM_XCHGADD_ALGORITHM ---help--- Qualcomm Hexagon is a processor architecture designed for high performance and low power across a wide variety of applications.
@@ -64,12 +65,6 @@ config GENERIC_CSUM config GENERIC_IRQ_PROBE def_bool y -config RWSEM_GENERIC_SPINLOCK - def_bool n - -config RWSEM_XCHGADD_ALGORITHM - def_bool y - config GENERIC_HWEIGHT def_bool y
arch/ia64/Kconfig +1 -4
@@ -53,6 +53,7 @@ config IA64 select HAVE_ARCH_AUDITSYSCALL select NEED_DMA_MAP_STATE select NEED_SG_DMA_LENGTH + select RWSEM_XCHGADD_ALGORITHM default y help The Itanium Processor Family is Intel's 64-bit successor to
@@ -83,10 +84,6 @@ config STACKTRACE_SUPPORT config GENERIC_LOCKBREAK def_bool n -config RWSEM_XCHGADD_ALGORITHM - bool - default y - config HUGETLB_PAGE_SIZE_VARIABLE bool depends on HUGETLB_PAGE
arch/m68k/Kconfig +0 -7
@@ -31,13 +31,6 @@ config M68K config CPU_BIG_ENDIAN def_bool y -config RWSEM_GENERIC_SPINLOCK - bool - default y - -config RWSEM_XCHGADD_ALGORITHM - bool - config ARCH_HAS_ILOG2_U32 bool
arch/microblaze/Kconfig +0 -6
@@ -57,15 +57,9 @@ config CPU_LITTLE_ENDIAN endchoice -config RWSEM_GENERIC_SPINLOCK - def_bool y - config ZONE_DMA def_bool y -config RWSEM_XCHGADD_ALGORITHM - bool - config ARCH_HAS_ILOG2_U32 def_bool n
arch/mips/Kconfig +0 -7
@@ -1037,13 +1037,6 @@ source "arch/mips/paravirt/Kconfig" endmenu -config RWSEM_GENERIC_SPINLOCK - bool - default y - -config RWSEM_XCHGADD_ALGORITHM - bool - config GENERIC_HWEIGHT bool default y
arch/nds32/Kconfig +0 -3
@@ -59,9 +59,6 @@ config GENERIC_LOCKBREAK def_bool y depends on PREEMPT -config RWSEM_GENERIC_SPINLOCK - def_bool y - config TRACE_IRQFLAGS_SUPPORT def_bool y
arch/nios2/Kconfig +0 -3
@@ -39,9 +39,6 @@ config NO_IOPORT_MAP config FPU def_bool n -config RWSEM_GENERIC_SPINLOCK - def_bool y - config TRACE_IRQFLAGS_SUPPORT def_bool n
arch/openrisc/Kconfig +0 -6
@@ -42,12 +42,6 @@ config CPU_BIG_ENDIAN config MMU def_bool y -config RWSEM_GENERIC_SPINLOCK - def_bool y - -config RWSEM_XCHGADD_ALGORITHM - def_bool n - config GENERIC_HWEIGHT def_bool y
arch/parisc/Kconfig +0 -6
@@ -74,12 +74,6 @@ config GENERIC_LOCKBREAK default y depends on SMP && PREEMPT -config RWSEM_GENERIC_SPINLOCK - def_bool y - -config RWSEM_XCHGADD_ALGORITHM - bool - config ARCH_HAS_ILOG2_U32 bool default n
arch/powerpc/Kconfig +1 -7
@@ -103,13 +103,6 @@ config LOCKDEP_SUPPORT bool default y -config RWSEM_GENERIC_SPINLOCK - bool - -config RWSEM_XCHGADD_ALGORITHM - bool - default y - config GENERIC_LOCKBREAK bool default y
@@ -239,6 +232,7 @@ config PPC select PCI_DOMAINS if PCI select PCI_SYSCALL if PCI select RTC_LIB + select RWSEM_XCHGADD_ALGORITHM select SPARSE_IRQ select SYSCTL_EXCEPTION_TRACE select VIRT_TO_BUS if !PPC64
arch/riscv/Kconfig +0 -3
@@ -69,9 +69,6 @@ config STACKTRACE_SUPPORT config TRACE_IRQFLAGS_SUPPORT def_bool y -config RWSEM_GENERIC_SPINLOCK - def_bool y - config GENERIC_BUG def_bool y depends on BUG
arch/s390/Kconfig +1 -6
@@ -14,12 +14,6 @@ config LOCKDEP_SUPPORT config STACKTRACE_SUPPORT def_bool y -config RWSEM_GENERIC_SPINLOCK - bool - -config RWSEM_XCHGADD_ALGORITHM - def_bool y - config ARCH_HAS_ILOG2_U32 def_bool n
@@ -181,6 +175,7 @@ config S390 select OLD_SIGSUSPEND3 select PCI_DOMAINS if PCI select PCI_MSI if PCI + select RWSEM_XCHGADD_ALGORITHM select SPARSE_IRQ select SYSCTL_EXCEPTION_TRACE select THREAD_INFO_IN_TASK
arch/sh/Kconfig +0 -6
@@ -89,12 +89,6 @@ config ARCH_DEFCONFIG default "arch/sh/configs/shx3_defconfig" if SUPERH32 default "arch/sh/configs/cayman_defconfig" if SUPERH64 -config RWSEM_GENERIC_SPINLOCK - def_bool y - -config RWSEM_XCHGADD_ALGORITHM - bool - config GENERIC_BUG def_bool y depends on BUG && SUPERH32
arch/sparc/Kconfig +1 -8
@@ -90,6 +90,7 @@ config SPARC64 select ARCH_CLOCKSOURCE_DATA select ARCH_HAS_PTE_SPECIAL select PCI_DOMAINS if PCI + select RWSEM_XCHGADD_ALGORITHM config ARCH_DEFCONFIG string
@@ -190,14 +191,6 @@ config NR_CPUS source "kernel/Kconfig.hz" -config RWSEM_GENERIC_SPINLOCK - bool - default y if SPARC32 - -config RWSEM_XCHGADD_ALGORITHM - bool - default y if SPARC64 - config GENERIC_HWEIGHT bool default y
arch/unicore32/Kconfig +0 -6
@@ -38,12 +38,6 @@ config STACKTRACE_SUPPORT config LOCKDEP_SUPPORT def_bool y -config RWSEM_GENERIC_SPINLOCK - def_bool y - -config RWSEM_XCHGADD_ALGORITHM - bool - config ARCH_HAS_ILOG2_U32 bool
arch/x86/Kconfig +1 -3
@@ -202,6 +202,7 @@ config X86 select PERF_EVENTS select RTC_LIB select RTC_MC146818_LIB + select RWSEM_XCHGADD_ALGORITHM select SPARSE_IRQ select SRCU select SYSCTL_EXCEPTION_TRACE
@@ -269,9 +270,6 @@ config ARCH_MAY_HAVE_PC_FDC def_bool y depends on ISA_DMA_API -config RWSEM_XCHGADD_ALGORITHM - def_bool y - config GENERIC_CALIBRATE_DELAY def_bool y
arch/x86/um/Kconfig +1 -6
@@ -26,18 +26,13 @@ config X86_32 config X86_64 def_bool 64BIT select MODULES_USE_ELF_RELA + select RWSEM_XCHGADD_ALGORITHM config ARCH_DEFCONFIG string default "arch/um/configs/i386_defconfig" if X86_32 default "arch/um/configs/x86_64_defconfig" if X86_64 -config RWSEM_XCHGADD_ALGORITHM - def_bool 64BIT - -config RWSEM_GENERIC_SPINLOCK - def_bool !RWSEM_XCHGADD_ALGORITHM - config 3_LEVEL_PGTABLES bool "Three-level pagetables" if !64BIT default 64BIT
arch/xtensa/Kconfig +1 -3
@@ -34,6 +34,7 @@ config XTENSA select IRQ_DOMAIN select MODULES_USE_ELF_RELA select PERF_USE_VMALLOC + select RWSEM_XCHGADD_ALGORITHM select VIRT_TO_BUS help Xtensa processors are 32-bit RISC machines designed by Tensilica
@@ -43,9 +44,6 @@ config XTENSA with reasonable minimum requirements. The Xtensa Linux project has a home page at <http://www.linux-xtensa.org/>. -config RWSEM_XCHGADD_ALGORITHM - def_bool y - config GENERIC_HWEIGHT def_bool y
kernel/Kconfig.locks +7 -0
@@ -248,3 +248,10 @@ config ARCH_USE_QUEUED_RWLOCKS config QUEUED_RWLOCKS def_bool y if ARCH_USE_QUEUED_RWLOCKS depends on SMP + +config RWSEM_XCHGADD_ALGORITHM + bool + +config RWSEM_GENERIC_SPINLOCK + default y if !RWSEM_XCHGADD_ALGORITHM + bool
Signature · 1 line
2.20.1
Re: [PATCH 03/11] kernel/locks: consolidate RWSEM_GENERIC_* options
Quoted 8 lines · Christoph Hellwig
Introduce one central definition of
RWSEM_XCHGADD_ALGORITHMandRWSEM_GENERIC_SPINLOCKinkernel/Kconfig.locksand let architectures selectRWSEM_XCHGADD_ALGORITHMif they want it, otherwise default to the spinlock version.Signed-off-by Christoph Hellwig <[email protected]>arch/m68k/Kconfig | 7 -------
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Geert Uytterhoeven
maintainerRe: [PATCH 03/11] kernel/locks: consolidate RWSEM_GENERIC_* options
In reply to Christoph HellwigQuoted 6 lines · Christoph Hellwig
Introduce one central definition of
RWSEM_XCHGADD_ALGORITHMandRWSEM_GENERIC_SPINLOCKinkernel/Kconfig.locksand let architectures selectRWSEM_XCHGADD_ALGORITHMif they want it, otherwise default to the spinlock version.Signed-off-by Christoph Hellwig <[email protected]>
Note that this conflicts with "[PATCH v4 2/3] locking/rwsem: Remove rwsem-spinlock.c & use rwsem-xadd.c for all archs"
https://lore.kernel.org/lkml/[email protected]/
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH 03/11] kernel/locks: consolidate RWSEM_GENERIC_* options
Quoted 6 lines · Geert Uytterhoeven
Quoted 5 lines · Christoph Hellwig
Introduce one central definition of
RWSEM_XCHGADD_ALGORITHMandRWSEM_GENERIC_SPINLOCKinkernel/Kconfig.locksand let architectures selectRWSEM_XCHGADD_ALGORITHMif they want it, otherwise default to the spinlock version.
Quoted 9 lines
Quoted 1 line
Signed-off-by Christoph Hellwig <[email protected]>Note that this conflicts with "[PATCH v4 2/3] locking/rwsem: Remove
rwsem-spinlock.c& userwsem-xadd.cfor all archs"
https://lore.kernel.org/lkml/[email protected]/Gr{oetje,eeting}s,
Geert
Christoph,
Would you mind dropping just patch 3 from your series?
Thanks,
Longman
Re: [PATCH 03/11] kernel/locks: consolidate RWSEM_GENERIC_* options
Quoted 1 line · Waiman Long
Would you mind dropping just patch 3 from your series?
Sure, we can just drop this patch.
Re: [PATCH 03/11] kernel/locks: consolidate RWSEM_GENERIC_* options
Quoted 3 lines · Christoph Hellwig
Quoted 1 line · Waiman Long
Would you mind dropping just patch 3 from your series?
Sure, we can just drop this patch.
Thanks,
Longman
PATCH 4/11 tracing: consolidate the STACKTRACE_SUPPORT symbol
In reply to Christoph HellwigAdd one definition to kernel/trace/Kconfig and let the architectures select if it supported.
--- arch/arc/Kconfig | 6 ++---- arch/arm/Kconfig | 5 +---- arch/arm64/Kconfig | 4 +--- arch/hexagon/Kconfig | 5 +---- arch/ia64/Kconfig | 4 +--- arch/microblaze/Kconfig | 4 +--- arch/mips/Kconfig | 5 +---- arch/nds32/Kconfig | 4 +--- arch/openrisc/Kconfig | 4 +--- arch/parisc/Kconfig | 4 +--- arch/powerpc/Kconfig | 5 +---- arch/riscv/Kconfig | 4 +--- arch/s390/Kconfig | 4 +--- arch/sh/Kconfig | 4 +--- arch/sparc/Kconfig | 5 +---- arch/um/Kconfig | 7 ++----- arch/unicore32/Kconfig | 4 +--- arch/x86/Kconfig | 4 +--- arch/xtensa/Kconfig | 4 +--- kernel/trace/Kconfig | 3 +++ 20 files changed, 24 insertions(+), 65 deletions(-)
arch/arc/Kconfig +2 -4
@@ -47,6 +47,8 @@ config ARC select OF_RESERVED_MEM select PCI_SYSCALL if PCI select PERF_USE_VMALLOC if ARC_CACHE_VIPT_ALIASING + select STACKTRACE_SUPPORT + select STACKTRACE config ARCH_HAS_CACHE_LINE_SIZE def_bool y
@@ -81,10 +83,6 @@ config GENERIC_CALIBRATE_DELAY config GENERIC_HWEIGHT def_bool y -config STACKTRACE_SUPPORT - def_bool y - select STACKTRACE - config HAVE_ARCH_TRANSPARENT_HUGEPAGE def_bool y depends on ARC_MMU_V4
arch/arm/Kconfig +1 -4
@@ -109,6 +109,7 @@ config ARM select REFCOUNT_FULL select RTC_LIB select RWSEM_XCHGADD_ALGORITHM + select STACKTRACE_SUPPORT select SYS_SUPPORTS_APM_EMULATION # Above selects are sorted alphabetically; please add new ones # according to that. Thanks.
@@ -165,10 +166,6 @@ config NO_IOPORT_MAP config SBUS bool -config STACKTRACE_SUPPORT - bool - default y - config LOCKDEP_SUPPORT bool default y
arch/arm64/Kconfig +1 -3
@@ -172,6 +172,7 @@ config ARM64 select REFCOUNT_FULL select RWSEM_XCHGADD_ALGORITHM select SPARSE_IRQ + select STACKTRACE_SUPPORT select SWIOTLB select SYSCTL_EXCEPTION_TRACE select THREAD_INFO_IN_TASK
@@ -226,9 +227,6 @@ config ARCH_MMAP_RND_COMPAT_BITS_MAX config NO_IOPORT_MAP def_bool y if !PCI -config STACKTRACE_SUPPORT - def_bool y - config ILLEGAL_POINTER_VALUE hex default 0xdead000000000000
arch/hexagon/Kconfig +1 -4
@@ -26,6 +26,7 @@ config HEXAGON select NO_IOPORT_MAP select GENERIC_IOMAP select GENERIC_SMP_IDLE_THREAD + select STACKTRACE select STACKTRACE_SUPPORT select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS_BROADCAST
@@ -68,10 +69,6 @@ config GENERIC_IRQ_PROBE config GENERIC_HWEIGHT def_bool y -config STACKTRACE_SUPPORT - def_bool y - select STACKTRACE - config GENERIC_BUG def_bool y depends on BUG
arch/ia64/Kconfig +1 -3
@@ -54,6 +54,7 @@ config IA64 select NEED_DMA_MAP_STATE select NEED_SG_DMA_LENGTH select RWSEM_XCHGADD_ALGORITHM + select STACKTRACE_SUPPORT default y help The Itanium Processor Family is Intel's 64-bit successor to
@@ -78,9 +79,6 @@ config MMU bool default y -config STACKTRACE_SUPPORT - def_bool y - config GENERIC_LOCKBREAK def_bool n
arch/microblaze/Kconfig +1 -3
@@ -37,6 +37,7 @@ config MICROBLAZE select OF_EARLY_FLATTREE select PCI_DOMAINS_GENERIC if PCI select PCI_SYSCALL if PCI + select STACKTRACE_SUPPORT select TRACING_SUPPORT select VIRT_TO_BUS select CPU_NO_EFFICIENT_FFS
@@ -75,9 +76,6 @@ config GENERIC_CALIBRATE_DELAY config GENERIC_CSUM def_bool y -config STACKTRACE_SUPPORT - def_bool y - config LOCKDEP_SUPPORT def_bool y
arch/mips/Kconfig +1 -4
@@ -80,6 +80,7 @@ config MIPS select MODULES_USE_ELF_REL if MODULES select PERF_USE_VMALLOC select RTC_LIB + select STACKTRACE_SUPPORT select SYSCTL_EXCEPTION_TRACE select VIRT_TO_BUS
@@ -3053,10 +3054,6 @@ config LOCKDEP_SUPPORT bool default y -config STACKTRACE_SUPPORT - bool - default y - config HAVE_LATENCYTOP_SUPPORT bool default y
arch/nds32/Kconfig +1 -3
@@ -38,6 +38,7 @@ config NDS32 select OF_EARLY_FLATTREE select NO_IOPORT_MAP select RTC_LIB + select STACKTRACE_SUPPORT select THREAD_INFO_IN_TASK select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_GRAPH_TRACER
@@ -62,9 +63,6 @@ config GENERIC_LOCKBREAK config TRACE_IRQFLAGS_SUPPORT def_bool y -config STACKTRACE_SUPPORT - def_bool y - config FIX_EARLYCON_MEM def_bool y
arch/openrisc/Kconfig +1 -3
@@ -35,6 +35,7 @@ config OPENRISC select OMPIC if SMP select ARCH_WANT_FRAME_POINTERS select GENERIC_IRQ_MULTI_HANDLER + select STACKTRACE_SUPPORT config CPU_BIG_ENDIAN def_bool y
@@ -56,9 +57,6 @@ config TRACE_IRQFLAGS_SUPPORT config GENERIC_CSUM def_bool y -config STACKTRACE_SUPPORT - def_bool y - config LOCKDEP_SUPPORT def_bool y
arch/parisc/Kconfig +1 -3
@@ -53,6 +53,7 @@ config PARISC select CPU_NO_EFFICIENT_FFS select NEED_DMA_MAP_STATE select NEED_SG_DMA_LENGTH + select STACKTRACE_SUPPORT help The PA-RISC microprocessor is designed by Hewlett-Packard and used
@@ -104,9 +105,6 @@ config TIME_LOW_RES config PM bool -config STACKTRACE_SUPPORT - def_bool y - config ISA_DMA_API bool
arch/powerpc/Kconfig +1 -4
@@ -91,10 +91,6 @@ config PPC_WATCHDOG seleted via the generic lockup detector menu which is why we have no standalone config option for it here. -config STACKTRACE_SUPPORT - bool - default y - config TRACE_IRQFLAGS_SUPPORT bool default y
@@ -234,6 +230,7 @@ config PPC select RTC_LIB select RWSEM_XCHGADD_ALGORITHM select SPARSE_IRQ + select STACKTRACE_SUPPORT select SYSCTL_EXCEPTION_TRACE select VIRT_TO_BUS if !PPC64 #
arch/riscv/Kconfig +1 -3
@@ -47,6 +47,7 @@ config RISCV select PCI_DOMAINS_GENERIC if PCI select PCI_MSI if PCI select RISCV_TIMER + select STACKTRACE_SUPPORT select GENERIC_IRQ_MULTI_HANDLER select ARCH_HAS_PTE_SPECIAL
@@ -63,9 +64,6 @@ config PAGE_OFFSET default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB -config STACKTRACE_SUPPORT - def_bool y - config TRACE_IRQFLAGS_SUPPORT def_bool y
arch/s390/Kconfig +1 -3
@@ -11,9 +11,6 @@ config CPU_BIG_ENDIAN config LOCKDEP_SUPPORT def_bool y -config STACKTRACE_SUPPORT - def_bool y - config ARCH_HAS_ILOG2_U32 def_bool n
@@ -177,6 +174,7 @@ config S390 select PCI_MSI if PCI select RWSEM_XCHGADD_ALGORITHM select SPARSE_IRQ + select STACKTRACE_SUPPORT select SYSCTL_EXCEPTION_TRACE select THREAD_INFO_IN_TASK select TTY
arch/sh/Kconfig +1 -3
@@ -49,6 +49,7 @@ config SUPERH select OLD_SIGSUSPEND select OLD_SIGACTION select PCI_DOMAINS if PCI + select STACKTRACE_SUPPORT select HAVE_ARCH_AUDITSYSCALL select HAVE_FUTEX_CMPXCHG if FUTEX select HAVE_NMI
@@ -126,9 +127,6 @@ config SYS_SUPPORTS_SMP config SYS_SUPPORTS_NUMA bool -config STACKTRACE_SUPPORT - def_bool y - config LOCKDEP_SUPPORT def_bool y
arch/sparc/Kconfig +1 -4
@@ -91,6 +91,7 @@ config SPARC64 select ARCH_HAS_PTE_SPECIAL select PCI_DOMAINS if PCI select RWSEM_XCHGADD_ALGORITHM + select STACKTRACE_SUPPORT config ARCH_DEFCONFIG string
@@ -107,10 +108,6 @@ config ARCH_ATU bool default y if SPARC64 -config STACKTRACE_SUPPORT - bool - default y if SPARC64 - config LOCKDEP_SUPPORT bool default y if SPARC64
arch/um/Kconfig +2 -5
@@ -17,6 +17,8 @@ config UML select GENERIC_CPU_DEVICES select GENERIC_CLOCKEVENTS select HAVE_GCC_PLUGINS + select STACKTRACE + select STACKTRACE_SUPPORT select TTY # Needed for line.c config MMU
@@ -40,11 +42,6 @@ config LOCKDEP_SUPPORT bool default y -config STACKTRACE_SUPPORT - bool - default y - select STACKTRACE - config GENERIC_CALIBRATE_DELAY bool default y
arch/unicore32/Kconfig +1 -3
@@ -20,6 +20,7 @@ config UNICORE32 select GENERIC_IOMAP select MODULES_USE_ELF_REL select NEED_DMA_MAP_STATE + select STACKTRACE_SUPPORT help UniCore-32 is 32-bit Instruction Set Architecture, including a series of low-power-consumption RISC chip
@@ -32,9 +33,6 @@ config GENERIC_CSUM config NO_IOPORT_MAP bool -config STACKTRACE_SUPPORT - def_bool y - config LOCKDEP_SUPPORT def_bool y
arch/x86/Kconfig +1 -3
@@ -206,6 +206,7 @@ config X86 select SPARSE_IRQ select SRCU select SYSCTL_EXCEPTION_TRACE + select STACKTRACE_SUPPORT select THREAD_INFO_IN_TASK select USER_STACKTRACE_SUPPORT select VIRT_TO_BUS
@@ -228,9 +229,6 @@ config ARCH_DEFCONFIG config LOCKDEP_SUPPORT def_bool y -config STACKTRACE_SUPPORT - def_bool y - config MMU def_bool y
arch/xtensa/Kconfig +1 -3
@@ -35,6 +35,7 @@ config XTENSA select MODULES_USE_ELF_RELA select PERF_USE_VMALLOC select RWSEM_XCHGADD_ALGORITHM + select STACKTRACE_SUPPORT select VIRT_TO_BUS help Xtensa processors are 32-bit RISC machines designed by Tensilica
@@ -63,9 +64,6 @@ config HZ config LOCKDEP_SUPPORT def_bool y -config STACKTRACE_SUPPORT - def_bool y - config TRACE_IRQFLAGS_SUPPORT def_bool y
kernel/trace/Kconfig +3 -0
@@ -3,6 +3,9 @@ # select HAVE_FUNCTION_TRACER: # +config STACKTRACE_SUPPORT + bool + config USER_STACKTRACE_SUPPORT bool
Signature · 1 line
2.20.1
PATCH 5/11 tracing: consolidate the TRACE_IRQFLAGS_SUPPORT symbol
In reply to Christoph HellwigAdd one definition to kernel/trace/Kconfig and let the architectures select if it supported.
--- arch/arc/Kconfig | 4 +--- arch/arm/Kconfig | 5 +---- arch/arm64/Kconfig | 4 +--- arch/csky/Kconfig | 4 +--- arch/hexagon/Kconfig | 4 +--- arch/microblaze/Kconfig | 1 + arch/microblaze/Kconfig.debug | 2 -- arch/mips/Kconfig | 1 + arch/mips/Kconfig.debug | 4 ---- arch/nds32/Kconfig | 4 +--- arch/nios2/Kconfig | 4 +--- arch/nios2/Kconfig.debug | 3 --- arch/openrisc/Kconfig | 4 +--- arch/parisc/Kconfig | 1 + arch/parisc/Kconfig.debug | 2 -- arch/powerpc/Kconfig | 5 +---- arch/riscv/Kconfig | 4 +--- arch/s390/Kconfig | 1 + arch/s390/Kconfig.debug | 3 --- arch/sh/Kconfig | 1 + arch/sh/Kconfig.debug | 3 --- arch/sparc/Kconfig | 1 + arch/sparc/Kconfig.debug | 4 ---- arch/um/Kconfig | 5 +---- arch/x86/Kconfig | 1 + arch/x86/Kconfig.debug | 3 --- arch/xtensa/Kconfig | 4 +--- kernel/trace/Kconfig | 3 +++ 28 files changed, 22 insertions(+), 63 deletions(-)
arch/arc/Kconfig +1 -3
@@ -49,13 +49,11 @@ config ARC select PERF_USE_VMALLOC if ARC_CACHE_VIPT_ALIASING select STACKTRACE_SUPPORT select STACKTRACE + select TRACE_IRQFLAGS_SUPPORT config ARCH_HAS_CACHE_LINE_SIZE def_bool y -config TRACE_IRQFLAGS_SUPPORT - def_bool y - config LOCKDEP_SUPPORT def_bool y
arch/arm/Kconfig +1 -4
@@ -111,6 +111,7 @@ config ARM select RWSEM_XCHGADD_ALGORITHM select STACKTRACE_SUPPORT select SYS_SUPPORTS_APM_EMULATION + select TRACE_IRQFLAGS_SUPPORT if !CPU_V7M # Above selects are sorted alphabetically; please add new ones # according to that. Thanks. help
@@ -170,10 +171,6 @@ config LOCKDEP_SUPPORT bool default y -config TRACE_IRQFLAGS_SUPPORT - bool - default !CPU_V7M - config ARCH_HAS_ILOG2_U32 bool
arch/arm64/Kconfig +1 -3
@@ -176,6 +176,7 @@ config ARM64 select SWIOTLB select SYSCTL_EXCEPTION_TRACE select THREAD_INFO_IN_TASK + select TRACE_IRQFLAGS_SUPPORT help ARM 64-bit (AArch64) Linux support.
@@ -234,9 +235,6 @@ config ILLEGAL_POINTER_VALUE config LOCKDEP_SUPPORT def_bool y -config TRACE_IRQFLAGS_SUPPORT - def_bool y - config GENERIC_BUG def_bool y depends on BUG
arch/csky/Kconfig +1 -3
@@ -46,6 +46,7 @@ config CSKY select PERF_USE_VMALLOC if CPU_CK610 select RTC_LIB select TIMER_OF + select TRACE_IRQFLAGS_SUPPORT select USB_ARCH_HAS_EHCI select USB_ARCH_HAS_OHCI
@@ -99,9 +100,6 @@ config STACKTRACE_SUPPORT config TIME_LOW_RES def_bool y -config TRACE_IRQFLAGS_SUPPORT - def_bool y - config CPU_TLB_SIZE int default "128" if (CPU_CK610 || CPU_CK807 || CPU_CK810)
arch/hexagon/Kconfig +1 -3
@@ -33,6 +33,7 @@ config HEXAGON select MODULES_USE_ELF_RELA select GENERIC_CPU_DEVICES select RWSEM_XCHGADD_ALGORITHM + select TRACE_IRQFLAGS_SUPPORT ---help--- Qualcomm Hexagon is a processor architecture designed for high performance and low power across a wide variety of applications.
@@ -54,9 +55,6 @@ config EARLY_PRINTK config MMU def_bool y -config TRACE_IRQFLAGS_SUPPORT - def_bool y - config GENERIC_CSUM def_bool y
arch/microblaze/Kconfig +1 -0
@@ -38,6 +38,7 @@ config MICROBLAZE select PCI_DOMAINS_GENERIC if PCI select PCI_SYSCALL if PCI select STACKTRACE_SUPPORT + select TRACE_IRQFLAGS_SUPPORT select TRACING_SUPPORT select VIRT_TO_BUS select CPU_NO_EFFICIENT_FFS
arch/microblaze/Kconfig.debug +0 -2
@@ -1,5 +1,3 @@ # For a description of the syntax of this configuration file, # see Documentation/kbuild/kconfig-language.txt. -config TRACE_IRQFLAGS_SUPPORT - def_bool y
arch/mips/Kconfig +1 -0
@@ -82,6 +82,7 @@ config MIPS select RTC_LIB select STACKTRACE_SUPPORT select SYSCTL_EXCEPTION_TRACE + select TRACE_IRQFLAGS_SUPPORT select VIRT_TO_BUS menu "Machine selection"
arch/mips/Kconfig.debug +0 -4
@@ -1,9 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -config TRACE_IRQFLAGS_SUPPORT - bool - default y - config EARLY_PRINTK bool "Early printk" if EXPERT depends on SYS_HAS_EARLY_PRINTK
arch/nds32/Kconfig +1 -3
@@ -40,6 +40,7 @@ config NDS32 select RTC_LIB select STACKTRACE_SUPPORT select THREAD_INFO_IN_TASK + select TRACE_IRQFLAGS_SUPPORT select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FTRACE_MCOUNT_RECORD
@@ -60,9 +61,6 @@ config GENERIC_LOCKBREAK def_bool y depends on PREEMPT -config TRACE_IRQFLAGS_SUPPORT - def_bool y - config FIX_EARLYCON_MEM def_bool y
arch/nios2/Kconfig +1 -3
@@ -20,6 +20,7 @@ config NIOS2 select OF_EARLY_FLATTREE select SOC_BUS select SPARSE_IRQ + select TRACE_IRQFLAGS_SUPPORT select USB_ARCH_HAS_HCD if USB_SUPPORT select CPU_NO_EFFICIENT_FFS select ARCH_DISCARD_MEMBLOCK
@@ -39,9 +40,6 @@ config NO_IOPORT_MAP config FPU def_bool n -config TRACE_IRQFLAGS_SUPPORT - def_bool n - menu "Kernel features" source "kernel/Kconfig.hz"
arch/nios2/Kconfig.debug +0 -3
@@ -1,8 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -config TRACE_IRQFLAGS_SUPPORT - def_bool y - config EARLY_PRINTK bool "Activate early kernel debugging" default y
arch/openrisc/Kconfig +1 -3
@@ -36,6 +36,7 @@ config OPENRISC select ARCH_WANT_FRAME_POINTERS select GENERIC_IRQ_MULTI_HANDLER select STACKTRACE_SUPPORT + select TRACE_IRQFLAGS_SUPPORT config CPU_BIG_ENDIAN def_bool y
@@ -49,9 +50,6 @@ config GENERIC_HWEIGHT config NO_IOPORT_MAP def_bool y -config TRACE_IRQFLAGS_SUPPORT - def_bool y - # For now, use generic checksum functions #These can be reimplemented in assembly later if so inclined config GENERIC_CSUM
arch/parisc/Kconfig +1 -0
@@ -54,6 +54,7 @@ config PARISC select NEED_DMA_MAP_STATE select NEED_SG_DMA_LENGTH select STACKTRACE_SUPPORT + select TRACE_IRQFLAGS_SUPPORT help The PA-RISC microprocessor is designed by Hewlett-Packard and used
arch/parisc/Kconfig.debug +0 -2
@@ -1,4 +1,2 @@ # SPDX-License-Identifier: GPL-2.0 -config TRACE_IRQFLAGS_SUPPORT - def_bool y
arch/powerpc/Kconfig +1 -4
@@ -91,10 +91,6 @@ config PPC_WATCHDOG seleted via the generic lockup detector menu which is why we have no standalone config option for it here. -config TRACE_IRQFLAGS_SUPPORT - bool - default y - config LOCKDEP_SUPPORT bool default y
@@ -232,6 +228,7 @@ config PPC select SPARSE_IRQ select STACKTRACE_SUPPORT select SYSCTL_EXCEPTION_TRACE + select TRACE_IRQFLAGS_SUPPORT select VIRT_TO_BUS if !PPC64 # # Please keep this list sorted alphabetically.
arch/riscv/Kconfig +1 -3
@@ -48,6 +48,7 @@ config RISCV select PCI_MSI if PCI select RISCV_TIMER select STACKTRACE_SUPPORT + select TRACE_IRQFLAGS_SUPPORT select GENERIC_IRQ_MULTI_HANDLER select ARCH_HAS_PTE_SPECIAL
@@ -64,9 +65,6 @@ config PAGE_OFFSET default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB -config TRACE_IRQFLAGS_SUPPORT - def_bool y - config GENERIC_BUG def_bool y depends on BUG
arch/s390/Kconfig +1 -0
@@ -177,6 +177,7 @@ config S390 select STACKTRACE_SUPPORT select SYSCTL_EXCEPTION_TRACE select THREAD_INFO_IN_TASK + select TRACE_IRQFLAGS_SUPPORT select TTY select VIRT_CPU_ACCOUNTING select ARCH_HAS_SCALED_CPUTIME
arch/s390/Kconfig.debug +0 -3
@@ -1,8 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -config TRACE_IRQFLAGS_SUPPORT - def_bool y - config S390_PTDUMP bool "Export kernel pagetable layout to userspace via debugfs" depends on DEBUG_KERNEL
arch/sh/Kconfig +1 -0
@@ -50,6 +50,7 @@ config SUPERH select OLD_SIGACTION select PCI_DOMAINS if PCI select STACKTRACE_SUPPORT + select TRACE_IRQFLAGS_SUPPORT select HAVE_ARCH_AUDITSYSCALL select HAVE_FUTEX_CMPXCHG if FUTEX select HAVE_NMI
arch/sh/Kconfig.debug +0 -3
@@ -1,8 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -config TRACE_IRQFLAGS_SUPPORT - def_bool y - config SH_STANDARD_BIOS bool "Use LinuxSH standard BIOS" depends on SUPERH32
arch/sparc/Kconfig +1 -0
@@ -46,6 +46,7 @@ config SPARC select LOCKDEP_SMALL if LOCKDEP select NEED_DMA_MAP_STATE select NEED_SG_DMA_LENGTH + select TRACE_IRQFLAGS_SUPPORT config SPARC32 def_bool !64BIT
arch/sparc/Kconfig.debug +0 -4
@@ -1,9 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -config TRACE_IRQFLAGS_SUPPORT - bool - default y - config DEBUG_DCFLUSH bool "D-cache flush debugging" depends on SPARC64 && DEBUG_KERNEL
arch/um/Kconfig +1 -4
@@ -19,6 +19,7 @@ config UML select HAVE_GCC_PLUGINS select STACKTRACE select STACKTRACE_SUPPORT + select TRACE_IRQFLAGS_SUPPORT select TTY # Needed for line.c config MMU
@@ -34,10 +35,6 @@ config ISA config SBUS bool -config TRACE_IRQFLAGS_SUPPORT - bool - default y - config LOCKDEP_SUPPORT bool default y
arch/x86/Kconfig +1 -0
@@ -210,6 +210,7 @@ config X86 select THREAD_INFO_IN_TASK select USER_STACKTRACE_SUPPORT select VIRT_TO_BUS + select TRACE_IRQFLAGS_SUPPORT select X86_FEATURE_NAMES if PROC_FS config INSTRUCTION_DECODER
arch/x86/Kconfig.debug +0 -3
@@ -1,8 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -config TRACE_IRQFLAGS_SUPPORT - def_bool y - config EARLY_PRINTK_USB bool
arch/xtensa/Kconfig +1 -3
@@ -36,6 +36,7 @@ config XTENSA select PERF_USE_VMALLOC select RWSEM_XCHGADD_ALGORITHM select STACKTRACE_SUPPORT + select TRACE_IRQFLAGS_SUPPORT select VIRT_TO_BUS help Xtensa processors are 32-bit RISC machines designed by Tensilica
@@ -64,9 +65,6 @@ config HZ config LOCKDEP_SUPPORT def_bool y -config TRACE_IRQFLAGS_SUPPORT - def_bool y - config MMU def_bool n
kernel/trace/Kconfig +3 -0
@@ -9,6 +9,9 @@ config STACKTRACE_SUPPORT config USER_STACKTRACE_SUPPORT bool +config TRACE_IRQFLAGS_SUPPORT + bool + config NOP_TRACER bool
Signature · 1 line
2.20.1
Re: [PATCH 05/11] tracing: consolidate the TRACE_IRQFLAGS_SUPPORT symbol
+CC: Ley Foon Tan <[email protected]>
+CC: [email protected]
arch/nios2/Kconfig config NIOS2 · line 23
Quoted 9 lines · Christoph Hellwig
arch/nios2/Kconfig +1
-0@@ -20,6 +20,7 @@ config NIOS2 select OF_EARLY_FLATTREE select SOC_BUS select SPARSE_IRQ + select TRACE_IRQFLAGS_SUPPORT
This is a behavior change of nios2.
TRACE_IRQFLAGS_SUPPORT was previously 'n',
and this commit is changing it to 'y'.
Strangely, nios2 defines TRACE_IRQFLAGS_SUPPORT twice with different default values.
In Kconfig, the first one becomes effective.
In this case, 'def_bool n' in arch/nios2/Kconfig is used. 'def_bool y' in arch/nios2/Kconfig.debug is dead code.
I think this select should be dropped
to keep the current behavior,
but I hope the NIOS2 maintainer will give us
some comments just in case.
Quoted 18 lines
arch/nios2/Kconfig +0
-3select USB_ARCH_HAS_HCD if USB_SUPPORT select CPU_NO_EFFICIENT_FFS select ARCH_DISCARD_MEMBLOCK@@ -39,9 +40,6 @@ config NO_IOPORT_MAP config FPU def_bool n -config TRACE_IRQFLAGS_SUPPORT - def_bool n - menu "Kernel features" source "kernel/Kconfig.hz"arch/nios2/Kconfig.debug +0
-0
arch/nios2/Kconfig.debug line 5
Quoted 8 lines
arch/nios2/Kconfig.debug +0
-3@@ -1,8 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -config TRACE_IRQFLAGS_SUPPORT - def_bool y - config EARLY_PRINTK bool "Activate early kernel debugging" default y
--
Best Regards
Masahiro Yamada
Re: [PATCH 05/11] tracing: consolidate the TRACE_IRQFLAGS_SUPPORT symbol
Quoted 30 lines · Masahiro Yamada
(quoted diff) +2
-0+CC: Ley Foon Tan <[email protected]> +CC: [email protected]Quoted 10 lines · Christoph Hellwig
arch/nios2/Kconfig +0
-0@@ -20,6 +20,7 @@ config NIOS2select
OF_EARLY_FLATTREE
selectSOC_BUS
selectSPARSE_IRQ
+ selectTRACE_IRQFLAGS_SUPPORTThis is a behavior change of nios2.
TRACE_IRQFLAGS_SUPPORTwas previously 'n',
and this commit is changing it to 'y'.Strangely, nios2 defines
TRACE_IRQFLAGS_SUPPORTtwice with different default values.In
Kconfig, the first one becomes effective.
Quoted 9 lines
In this case, '
def_booln' inarch/nios2/Kconfigis used. 'def_booly' inarch/nios2/Kconfig.debugis dead code.I think this select should be dropped
to keep the current behavior,
but I hope the NIOS2 maintainer will give us
some comments just in case.
Yes, please drop this patch to keep original behavior. Thanks.
Regards
Ley Foon
Quoted 44 lines
Quoted 27 lines
select
USB_ARCH_HAS_HCDifUSB_SUPPORT
selectCPU_NO_EFFICIENT_FFS
selectARCH_DISCARD_MEMBLOCKarch/nios2/Kconfig +0
-0@@ -39,9 +40,6 @@ config NO_IOPORT_MAPconfig FPU
def_bool narch/nios2/Kconfig +0
-3-config TRACE_IRQFLAGS_SUPPORT - def_bool n -menu "Kernel features"
source "
kernel/Kconfig.hz"arch/nios2/Kconfig.debug +0
-3@@ -1,8 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -config TRACE_IRQFLAGS_SUPPORT - def_bool y -Quoted 3 lines
config
EARLY_PRINTK
bool "Activate early kernel debugging"
default y--
Best Regards
Masahiro Yamada________________________________
Confidentiality Notice.
This message may contain information that is confidential or otherwise protected from disclosure. If you are not the intended recipient, you are hereby notified that any use, disclosure, dissemination, distribution, or copying of this message, or any attachments, is strictly prohibited. If you have received this message in error, please advise the sender by reply e-mail, and delete the message and any attachments. Thank you.
PATCH 6/11 lockdep: consolidate the LOCKDEP_SUPPORT symbol
In reply to Christoph HellwigAdd one definition to lib/Kconfig.debug and let the architectures select if it supported.
--- arch/arc/Kconfig | 4 +--- arch/arm/Kconfig | 5 +---- arch/arm64/Kconfig | 4 +--- arch/hexagon/Kconfig | 4 +--- arch/microblaze/Kconfig | 4 +--- arch/mips/Kconfig | 5 +---- arch/openrisc/Kconfig | 4 +--- arch/powerpc/Kconfig | 5 +---- arch/s390/Kconfig | 4 +--- arch/sh/Kconfig | 4 +--- arch/sparc/Kconfig | 5 +---- arch/um/Kconfig | 5 +---- arch/unicore32/Kconfig | 4 +--- arch/x86/Kconfig | 4 +--- arch/xtensa/Kconfig | 4 +--- lib/Kconfig.debug | 3 +++ 16 files changed, 18 insertions(+), 50 deletions(-)
arch/arc/Kconfig +1 -3
@@ -42,6 +42,7 @@ config ARC select HANDLE_DOMAIN_IRQ select IRQ_DOMAIN select MODULES_USE_ELF_RELA + select LOCKDEP_SUPPORT select OF select OF_EARLY_FLATTREE select OF_RESERVED_MEM
@@ -54,9 +55,6 @@ config ARC config ARCH_HAS_CACHE_LINE_SIZE def_bool y -config LOCKDEP_SUPPORT - def_bool y - config SCHED_OMIT_FRAME_POINTER def_bool y
arch/arm/Kconfig +1 -4
@@ -98,6 +98,7 @@ config ARM select HAVE_UID16 select HAVE_VIRT_CPU_ACCOUNTING_GEN select IRQ_FORCED_THREADING + select LOCKDEP_SUPPORT select MODULES_USE_ELF_REL select NEED_DMA_MAP_STATE select OF_EARLY_FLATTREE if OF
@@ -167,10 +168,6 @@ config NO_IOPORT_MAP config SBUS bool -config LOCKDEP_SUPPORT - bool - default y - config ARCH_HAS_ILOG2_U32 bool
arch/arm64/Kconfig +1 -3
@@ -157,6 +157,7 @@ config ARM64 select IOMMU_DMA if IOMMU_SUPPORT select IRQ_DOMAIN select IRQ_FORCED_THREADING + select LOCKDEP_SUPPORT select MODULES_USE_ELF_RELA select MULTI_IRQ_HANDLER select NEED_DMA_MAP_STATE
@@ -232,9 +233,6 @@ config ILLEGAL_POINTER_VALUE hex default 0xdead000000000000 -config LOCKDEP_SUPPORT - def_bool y - config GENERIC_BUG def_bool y depends on BUG
arch/hexagon/Kconfig +1 -3
@@ -21,6 +21,7 @@ config HEXAGON select GENERIC_IRQ_SHOW select HAVE_ARCH_KGDB select HAVE_ARCH_TRACEHOOK + select LOCKDEP_SUPPORT select ARCH_DISCARD_MEMBLOCK select NEED_SG_DMA_LENGTH select NO_IOPORT_MAP
@@ -46,9 +47,6 @@ config HEXAGON_PHYS_OFFSET config FRAME_POINTER def_bool y -config LOCKDEP_SUPPORT - def_bool y - config EARLY_PRINTK def_bool y
arch/microblaze/Kconfig +1 -3
@@ -31,6 +31,7 @@ config MICROBLAZE select HAVE_OPROFILE select HAVE_PCI select IRQ_DOMAIN + select LOCKDEP_SUPPORT select XILINX_INTC select MODULES_USE_ELF_RELA select OF
@@ -77,9 +78,6 @@ config GENERIC_CALIBRATE_DELAY config GENERIC_CSUM def_bool y -config LOCKDEP_SUPPORT - def_bool y - source "arch/microblaze/Kconfig.platform" menu "Processor type and features"
arch/mips/Kconfig +1 -4
@@ -76,6 +76,7 @@ config MIPS select HAVE_VIRT_CPU_ACCOUNTING_GEN if 64BIT || !SMP select IRQ_FORCED_THREADING select ISA if EISA + select LOCKDEP_SUPPORT select MODULES_USE_ELF_RELA if MODULES && 64BIT select MODULES_USE_ELF_REL if MODULES select PERF_USE_VMALLOC
@@ -3051,10 +3052,6 @@ endchoice endmenu -config LOCKDEP_SUPPORT - bool - default y - config HAVE_LATENCYTOP_SUPPORT bool default y
arch/openrisc/Kconfig +1 -3
@@ -28,6 +28,7 @@ config OPENRISC select GENERIC_SMP_IDLE_THREAD select MODULES_USE_ELF_RELA select HAVE_DEBUG_STACKOVERFLOW + select LOCKDEP_SUPPORT select OR1K_PIC select CPU_NO_EFFICIENT_FFS if !OPENRISC_HAVE_INST_FF1 select ARCH_USE_QUEUED_SPINLOCKS
@@ -55,9 +56,6 @@ config NO_IOPORT_MAP config GENERIC_CSUM def_bool y -config LOCKDEP_SUPPORT - def_bool y - menu "Processor type and features" choice
arch/powerpc/Kconfig +1 -4
@@ -91,10 +91,6 @@ config PPC_WATCHDOG seleted via the generic lockup detector menu which is why we have no standalone config option for it here. -config LOCKDEP_SUPPORT - bool - default y - config GENERIC_LOCKBREAK bool default y
@@ -213,6 +209,7 @@ config PPC select IOMMU_HELPER if PPC64 select IRQ_DOMAIN select IRQ_FORCED_THREADING + select LOCKDEP_SUPPORT select MODULES_USE_ELF_RELA select NEED_DMA_MAP_STATE if PPC64 || NOT_COHERENT_CACHE select NEED_SG_DMA_LENGTH
arch/s390/Kconfig +1 -3
@@ -8,9 +8,6 @@ config ZONE_DMA config CPU_BIG_ENDIAN def_bool y -config LOCKDEP_SUPPORT - def_bool y - config ARCH_HAS_ILOG2_U32 def_bool n
@@ -165,6 +162,7 @@ config S390 select HAVE_VIRT_CPU_ACCOUNTING select IOMMU_HELPER if PCI select IOMMU_SUPPORT if PCI + select LOCKDEP_SUPPORT select MODULES_USE_ELF_RELA select NEED_DMA_MAP_STATE if PCI select NEED_SG_DMA_LENGTH if PCI
arch/sh/Kconfig +1 -3
@@ -32,6 +32,7 @@ config SUPERH select HAVE_REGS_AND_STACK_ACCESS_API select MAY_HAVE_SPARSE_IRQ select IRQ_FORCED_THREADING + select LOCKDEP_SUPPORT select RTC_LIB select GENERIC_ATOMIC64 select GENERIC_IRQ_SHOW
@@ -128,9 +129,6 @@ config SYS_SUPPORTS_SMP config SYS_SUPPORTS_NUMA bool -config LOCKDEP_SUPPORT - def_bool y - config ARCH_HAS_ILOG2_U32 def_bool n
arch/sparc/Kconfig +1 -4
@@ -85,6 +85,7 @@ config SPARC64 select ARCH_SUPPORTS_ATOMIC_RMW select HAVE_NMI select HAVE_REGS_AND_STACK_ACCESS_API + select LOCKDEP_SUPPORT select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKS select GENERIC_TIME_VSYSCALL
@@ -109,10 +110,6 @@ config ARCH_ATU bool default y if SPARC64 -config LOCKDEP_SUPPORT - bool - default y if SPARC64 - config ARCH_HIBERNATION_POSSIBLE def_bool y if SPARC64
arch/um/Kconfig +1 -4
@@ -17,6 +17,7 @@ config UML select GENERIC_CPU_DEVICES select GENERIC_CLOCKEVENTS select HAVE_GCC_PLUGINS + select LOCKDEP_SUPPORT select STACKTRACE select STACKTRACE_SUPPORT select TRACE_IRQFLAGS_SUPPORT
@@ -35,10 +36,6 @@ config ISA config SBUS bool -config LOCKDEP_SUPPORT - bool - default y - config GENERIC_CALIBRATE_DELAY bool default y
arch/unicore32/Kconfig +1 -3
@@ -11,6 +11,7 @@ config UNICORE32 select HAVE_KERNEL_LZO select HAVE_KERNEL_LZMA select HAVE_PCI + select LOCKDEP_SUPPORT select VIRT_TO_BUS select ARCH_HAVE_CUSTOM_GPIO_H select GENERIC_FIND_FIRST_BIT
@@ -33,9 +34,6 @@ config GENERIC_CSUM config NO_IOPORT_MAP bool -config LOCKDEP_SUPPORT - def_bool y - config ARCH_HAS_ILOG2_U32 bool
arch/x86/Kconfig +1 -3
@@ -196,6 +196,7 @@ config X86 select HAVE_USER_RETURN_NOTIFIER select HOTPLUG_SMT if SMP select IRQ_FORCED_THREADING + select LOCKDEP_SUPPORT select NEED_SG_DMA_LENGTH select PCI_DOMAINS if PCI select PCI_LOCKLESS_CONFIG if PCI
@@ -227,9 +228,6 @@ config ARCH_DEFCONFIG default "arch/x86/configs/i386_defconfig" if X86_32 default "arch/x86/configs/x86_64_defconfig" if X86_64 -config LOCKDEP_SUPPORT - def_bool y - config MMU def_bool y
arch/xtensa/Kconfig +1 -3
@@ -32,6 +32,7 @@ config XTENSA select HAVE_STACKPROTECTOR select HAVE_SYSCALL_TRACEPOINTS select IRQ_DOMAIN + select LOCKDEP_SUPPORT select MODULES_USE_ELF_RELA select PERF_USE_VMALLOC select RWSEM_XCHGADD_ALGORITHM
@@ -62,9 +63,6 @@ config HZ int default 100 -config LOCKDEP_SUPPORT - def_bool y - config MMU def_bool n
lib/Kconfig.debug +3 -0
@@ -1054,6 +1054,9 @@ config DEBUG_PREEMPT menu "Lock Debugging (spinlocks, mutexes, etc...)" +config LOCKDEP_SUPPORT + bool + config LOCK_DEBUGGING_SUPPORT bool depends on TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
Signature · 1 line
2.20.1
Re: [PATCH 06/11] lockdep: consolidate the LOCKDEP_SUPPORT symbol
+CC Greentime Hu
+CC Vincent Chen
Quoted 5 lines · Christoph Hellwig
Add one definition to
lib/Kconfig.debugand let the architectures select if it supported.Signed-off-by Christoph Hellwig <[email protected]>
This changes the behavior of nds32.
So please leave a note in the commit description. (Ideally, we want Ack of a NDS32 maintainer)
Also, please do compile test for NDS32.
-------------------------
This commit changes CONFIG_LOCKDEP_SUPPORT to y for nds32.
NDS32 selects LOCKEP_SUPPORT, but there was previously no config entry of LOCKDEP_SUPPORT in nds32.
It is now available in lib/Kconfig.debug,
so this commit enables LOCKDEP_SUPPORT for nds32.
-------------------------
--
Best Regards
Masahiro Yamada
Re: [PATCH 06/11] lockdep: consolidate the LOCKDEP_SUPPORT symbol
Hi Yamada,
Masahiro Yamada <[email protected]> 於 2019年2月15日 週五 下午3:17寫道:
Quoted 24 lines
(quoted diff) +2
-0+CC Greentime Hu +CC Vincent ChenQuoted 5 lines · Christoph Hellwig
Add one definition to
lib/Kconfig.debugand let the architectures select if it supported.Signed-off-by Christoph Hellwig <[email protected]>This changes the behavior of nds32.
So please leave a note in the commit description. (Ideally, we want Ack of a NDS32 maintainer)
Also, please do compile test for NDS32.
-------------------------
This commit changesCONFIG_LOCKDEP_SUPPORTto y for nds32.
Quoted 6 lines
NDS32 selects
LOCKEP_SUPPORT, but there was previously no config entry ofLOCKDEP_SUPPORTin nds32.It is now available in
lib/Kconfig.debug,
so this commit enablesLOCKDEP_SUPPORTfor nds32.
-------------------------
Thank you to let us know this change.
I think it's ok to enable LOCKDEP_SUPPORT for nds32. I just verified it in 5.0.0-rc1.
PATCH 7/11 init: consolidate the GENERIC_CALIBRATE_DELAY symbol
In reply to Christoph HellwigAdd one definition to init/Kconfig and let the architectures select it if supported. The only complication is xtensa, where it is a user visible option - we introduce a xtensa-specific symbol instead to work around this.
--- arch/alpha/Kconfig | 5 +---- arch/arc/Kconfig | 4 +--- arch/arm/Kconfig | 5 +---- arch/arm64/Kconfig | 4 +--- arch/c6x/Kconfig | 4 +--- arch/csky/Kconfig | 4 +--- arch/ia64/Kconfig | 5 +---- arch/m68k/Kconfig | 5 +---- arch/microblaze/Kconfig | 4 +--- arch/mips/Kconfig | 5 +---- arch/nds32/Kconfig | 4 +--- arch/nios2/Kconfig | 4 +--- arch/parisc/Kconfig | 5 +---- arch/riscv/Kconfig | 4 +--- arch/sh/Kconfig | 3 --- arch/sparc/Kconfig | 5 +---- arch/um/Kconfig | 5 +---- arch/unicore32/Kconfig | 4 +--- arch/x86/Kconfig | 4 +--- arch/xtensa/Kconfig | 3 ++- init/Kconfig | 3 +++ 21 files changed, 23 insertions(+), 66 deletions(-)
arch/alpha/Kconfig +1 -4
@@ -25,6 +25,7 @@ config ALPHA select ARCH_WANT_IPC_PARSE_VERSION select ARCH_HAVE_NMI_SAFE_CMPXCHG select AUDIT_ARCH + select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS select GENERIC_CPU_VULNERABILITIES select GENERIC_SMP_IDLE_THREAD
@@ -58,10 +59,6 @@ config ARCH_HAS_ILOG2_U64 bool default n -config GENERIC_CALIBRATE_DELAY - bool - default y - config ZONE_DMA bool default y
arch/arc/Kconfig +1 -3
@@ -17,6 +17,7 @@ config ARC select BUILDTIME_EXTABLE_SORT select CLONE_BACKWARDS select COMMON_CLK + select GENERIC_CALIBRATE_DELAY select GENERIC_ATOMIC64 if !ISA_ARCV2 || !(ARC_HAS_LL64 && ARC_HAS_LLSC) select GENERIC_CLOCKEVENTS select GENERIC_FIND_FIRST_BIT
@@ -73,9 +74,6 @@ config MMU config NO_IOPORT_MAP def_bool y -config GENERIC_CALIBRATE_DELAY - def_bool y - config GENERIC_HWEIGHT def_bool y
arch/arm/Kconfig +1 -4
@@ -36,6 +36,7 @@ config ARM select GENERIC_ALLOCATOR select GENERIC_ARCH_TOPOLOGY if ARM_CPU_TOPOLOGY select GENERIC_ATOMIC64 if CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI + select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS_BROADCAST if SMP select GENERIC_CPU_AUTOPROBE select GENERIC_EARLY_IOREMAP
@@ -184,10 +185,6 @@ config GENERIC_HWEIGHT bool default y -config GENERIC_CALIBRATE_DELAY - bool - default y - config ARCH_MAY_HAVE_PC_FDC bool
arch/arm64/Kconfig +1 -3
@@ -85,6 +85,7 @@ config ARM64 select FRAME_POINTER select GENERIC_ALLOCATOR select GENERIC_ARCH_TOPOLOGY + select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS_BROADCAST select GENERIC_CPU_AUTOPROBE
@@ -247,9 +248,6 @@ config GENERIC_HWEIGHT config GENERIC_CSUM def_bool y -config GENERIC_CALIBRATE_DELAY - def_bool y - config ZONE_DMA32 def_bool y
arch/c6x/Kconfig +1 -3
@@ -10,6 +10,7 @@ config C6X select ARCH_HAS_SYNC_DMA_FOR_DEVICE select CLKDEV_LOOKUP select GENERIC_ATOMIC64 + select GENERIC_CALIBRATE_DELAY select GENERIC_IRQ_SHOW select HAVE_ARCH_TRACEHOOK select SPARSE_IRQ
@@ -26,9 +27,6 @@ config MMU config FPU def_bool n -config GENERIC_CALIBRATE_DELAY - def_bool y - config GENERIC_HWEIGHT def_bool y
arch/csky/Kconfig +1 -3
@@ -11,6 +11,7 @@ config CSKY select IRQ_DOMAIN select HANDLE_DOMAIN_IRQ select DW_APB_TIMER_OF + select GENERIC_CALIBRATE_DELAY select GENERIC_LIB_ASHLDI3 select GENERIC_LIB_ASHRDI3 select GENERIC_LIB_LSHRDI3
@@ -82,9 +83,6 @@ config CPU_NO_USER_BKPT instruction exception. In kernel we parse the *regs->pc to determine whether to send SIGTRAP or not. -config GENERIC_CALIBRATE_DELAY - def_bool y - config GENERIC_CSUM def_bool y
arch/ia64/Kconfig +1 -4
@@ -34,6 +34,7 @@ config IA64 select ARCH_HAS_SYNC_DMA_FOR_CPU if SWIOTLB select VIRT_TO_BUS select ARCH_DISCARD_MEMBLOCK + select GENERIC_CALIBRATE_DELAY select GENERIC_IRQ_PROBE select GENERIC_PENDING_IRQ if SMP select GENERIC_IRQ_SHOW
@@ -87,10 +88,6 @@ config HUGETLB_PAGE_SIZE_VARIABLE depends on HUGETLB_PAGE default y -config GENERIC_CALIBRATE_DELAY - bool - default y - config HAVE_SETUP_PER_CPU_AREA def_bool y
arch/m68k/Kconfig +1 -4
@@ -14,6 +14,7 @@ config M68K select HAVE_UID16 select VIRT_TO_BUS select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS + select GENERIC_CALIBRATE_DELAY select GENERIC_CPU_DEVICES select GENERIC_IOMAP select GENERIC_STRNCPY_FROM_USER if MMU
@@ -41,10 +42,6 @@ config GENERIC_HWEIGHT bool default y -config GENERIC_CALIBRATE_DELAY - bool - default y - config GENERIC_CSUM bool
arch/microblaze/Kconfig +1 -3
@@ -13,6 +13,7 @@ config MICROBLAZE select CLONE_BACKWARDS3 select COMMON_CLK select GENERIC_ATOMIC64 + select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS select GENERIC_CPU_DEVICES select GENERIC_IDLE_POLL_SETUP
@@ -72,9 +73,6 @@ config ARCH_HAS_ILOG2_U64 config GENERIC_HWEIGHT def_bool y -config GENERIC_CALIBRATE_DELAY - def_bool y - config GENERIC_CSUM def_bool y
arch/mips/Kconfig +1 -4
@@ -19,6 +19,7 @@ config MIPS select CPU_NO_EFFICIENT_FFS if (TARGET_ISA_REV < 1) select CPU_PM if CPU_IDLE select GENERIC_ATOMIC64 if !64BIT + select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS select GENERIC_CMOS_UPDATE select GENERIC_CPU_AUTOPROBE
@@ -1044,10 +1045,6 @@ config GENERIC_HWEIGHT bool default y -config GENERIC_CALIBRATE_DELAY - bool - default y - config SCHED_OMIT_FRAME_POINTER bool default y
arch/nds32/Kconfig +1 -3
@@ -12,6 +12,7 @@ config NDS32 select CLONE_BACKWARDS select COMMON_CLK select GENERIC_ATOMIC64 + select GENERIC_CALIBRATE_DELAY select GENERIC_CPU_DEVICES select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP
@@ -48,9 +49,6 @@ config NDS32 help Andes(nds32) Linux support. -config GENERIC_CALIBRATE_DELAY - def_bool y - config GENERIC_CSUM def_bool y
arch/nios2/Kconfig +1 -3
@@ -6,6 +6,7 @@ config NIOS2 select ARCH_NO_SWAP select TIMER_OF select GENERIC_ATOMIC64 + select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS select GENERIC_CPU_DEVICES select GENERIC_IRQ_PROBE
@@ -31,9 +32,6 @@ config GENERIC_CSUM config GENERIC_HWEIGHT def_bool y -config GENERIC_CALIBRATE_DELAY - def_bool y - config NO_IOPORT_MAP def_bool y
arch/parisc/Kconfig +1 -4
@@ -27,6 +27,7 @@ config PARISC select HAVE_KERNEL_LZO select HAVE_KERNEL_XZ select GENERIC_ATOMIC64 if !64BIT + select GENERIC_CALIBRATE_DELAY select GENERIC_IRQ_PROBE select GENERIC_PCI_IOMAP select ARCH_HAVE_NMI_SAFE_CMPXCHG
@@ -93,10 +94,6 @@ config GENERIC_HWEIGHT bool default y -config GENERIC_CALIBRATE_DELAY - bool - default y - config TIME_LOW_RES bool depends on SMP
arch/riscv/Kconfig +1 -3
@@ -19,6 +19,7 @@ config RISCV select ARCH_WANT_FRAME_POINTERS select CLONE_BACKWARDS select COMMON_CLK + select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS select GENERIC_CPU_DEVICES select GENERIC_IRQ_SHOW
@@ -73,9 +74,6 @@ config GENERIC_BUG config GENERIC_BUG_RELATIVE_POINTERS bool -config GENERIC_CALIBRATE_DELAY - def_bool y - config GENERIC_CSUM def_bool y
arch/sh/Kconfig +0 -3
@@ -103,9 +103,6 @@ config GENERIC_CSUM config GENERIC_HWEIGHT def_bool y -config GENERIC_CALIBRATE_DELAY - bool - config GENERIC_LOCKBREAK def_bool y depends on SMP && PREEMPT
arch/sparc/Kconfig +1 -4
@@ -35,6 +35,7 @@ config SPARC select HAVE_EBPF_JIT if SPARC64 select HAVE_DEBUG_BUGVERBOSE select GENERIC_SMP_IDLE_THREAD + select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNLEN_USER
@@ -190,10 +191,6 @@ config GENERIC_HWEIGHT bool default y -config GENERIC_CALIBRATE_DELAY - bool - default y - config ARCH_MAY_HAVE_PC_FDC bool default y
arch/um/Kconfig +1 -4
@@ -13,6 +13,7 @@ config UML select HAVE_FUTEX_CMPXCHG if FUTEX select HAVE_DEBUG_KMEMLEAK select HAVE_DEBUG_BUGVERBOSE + select GENERIC_CALIBRATE_DELAY select GENERIC_IRQ_SHOW select GENERIC_CPU_DEVICES select GENERIC_CLOCKEVENTS
@@ -36,10 +37,6 @@ config ISA config SBUS bool -config GENERIC_CALIBRATE_DELAY - bool - default y - config HZ int default 100
arch/unicore32/Kconfig +1 -3
@@ -8,6 +8,7 @@ config UNICORE32 select HAVE_KERNEL_GZIP select HAVE_KERNEL_BZIP2 select GENERIC_ATOMIC64 + select GENERIC_CALIBRATE_DELAY select HAVE_KERNEL_LZO select HAVE_KERNEL_LZMA select HAVE_PCI
@@ -43,9 +44,6 @@ config ARCH_HAS_ILOG2_U64 config GENERIC_HWEIGHT def_bool y -config GENERIC_CALIBRATE_DELAY - def_bool y - config ARCH_MAY_HAVE_PC_FDC bool
arch/x86/Kconfig +1 -3
@@ -91,6 +91,7 @@ config X86 select DCACHE_WORD_ACCESS select EDAC_ATOMIC_SCRUB select EDAC_SUPPORT + select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC) select GENERIC_CLOCKEVENTS_MIN_ADJUST
@@ -267,9 +268,6 @@ config ARCH_MAY_HAVE_PC_FDC def_bool y depends on ISA_DMA_API -config GENERIC_CALIBRATE_DELAY - def_bool y - config ARCH_HAS_CPU_RELAX def_bool y
arch/xtensa/Kconfig +2 -1
@@ -416,8 +416,9 @@ config XTENSA_CPU_CLOCK depends on !XTENSA_CALIBRATE_CCOUNT default 16 -config GENERIC_CALIBRATE_DELAY +config XTENSA_GENERIC_CALIBRATE_DELAY bool "Auto calibration of the BogoMIPS value" + select GENERIC_CALIBRATE_DELAY help The BogoMIPS value can easily be derived from the CPU frequency.
init/Kconfig +3 -0
@@ -36,6 +36,9 @@ config IRQ_WORK config BUILDTIME_EXTABLE_SORT bool +config GENERIC_CALIBRATE_DELAY + bool + config THREAD_INFO_IN_TASK bool help
Signature · 1 line
2.20.1
Re: [PATCH 07/11] init: consolidate the GENERIC_CALIBRATE_DELAY symbol
Quoted 8 lines · Christoph Hellwig
Add one definition to init/Kconfig and let the architectures select it if supported. The only complication is xtensa, where it is a user visible option - we introduce a xtensa-specific symbol instead to work around this.
Signed-off-by Christoph Hellwig <[email protected]>arch/m68k/Kconfig | 5 +----
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
PATCH 8/11 lib: consolidate the GENERIC_BUG symbol
In reply to Christoph HellwigAnd just let the architectures that want it select the symbol. Same for GENERIC_BUG_RELATIVE_POINTERS.
--- arch/arm/Kconfig | 5 +---- arch/arm64/Kconfig | 10 ++-------- arch/c6x/Kconfig | 5 +---- arch/hexagon/Kconfig | 5 +---- arch/parisc/Kconfig | 6 +----- arch/powerpc/Kconfig | 6 +----- arch/riscv/Kconfig | 10 ++-------- arch/s390/Kconfig | 8 ++------ arch/sh/Kconfig | 5 +---- arch/x86/Kconfig | 10 ++-------- lib/Kconfig | 6 ++++++ 11 files changed, 20 insertions(+), 56 deletions(-)
arch/arm/Kconfig +1 -4
@@ -36,6 +36,7 @@ config ARM select GENERIC_ALLOCATOR select GENERIC_ARCH_TOPOLOGY if ARM_CPU_TOPOLOGY select GENERIC_ATOMIC64 if CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI + select GENERIC_BUG if BUG select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS_BROADCAST if SMP select GENERIC_CPU_AUTOPROBE
@@ -256,10 +257,6 @@ config PHYS_OFFSET Please provide the physical address corresponding to the location of main memory in your system. -config GENERIC_BUG - def_bool y - depends on BUG - config PGTABLE_LEVELS int default 3 if ARM_LPAE
arch/arm64/Kconfig +2 -8
@@ -85,6 +85,8 @@ config ARM64 select FRAME_POINTER select GENERIC_ALLOCATOR select GENERIC_ARCH_TOPOLOGY + select GENERIC_BUG if BUG + select GENERIC_BUG_RELATIVE_POINTERS select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS_BROADCAST
@@ -234,14 +236,6 @@ config ILLEGAL_POINTER_VALUE hex default 0xdead000000000000 -config GENERIC_BUG - def_bool y - depends on BUG - -config GENERIC_BUG_RELATIVE_POINTERS - def_bool y - depends on GENERIC_BUG - config GENERIC_HWEIGHT def_bool y
arch/c6x/Kconfig +1 -4
@@ -10,6 +10,7 @@ config C6X select ARCH_HAS_SYNC_DMA_FOR_DEVICE select CLKDEV_LOOKUP select GENERIC_ATOMIC64 + select GENERIC_BUG if BUG select GENERIC_CALIBRATE_DELAY select GENERIC_IRQ_SHOW select HAVE_ARCH_TRACEHOOK
@@ -30,10 +31,6 @@ config FPU config GENERIC_HWEIGHT def_bool y -config GENERIC_BUG - def_bool y - depends on BUG - config C6X_BIG_KERNEL bool "Build a big kernel" help
arch/hexagon/Kconfig +1 -4
@@ -14,6 +14,7 @@ config HEXAGON # select GPIOLIB # select HAVE_CLK # select GENERIC_PENDING_IRQ if SMP + select GENERIC_BUG if BUG select GENERIC_ATOMIC64 select HAVE_PERF_EVENTS # GENERIC_ALLOCATOR is used by dma_alloc_coherent()
@@ -65,10 +66,6 @@ config GENERIC_IRQ_PROBE config GENERIC_HWEIGHT def_bool y -config GENERIC_BUG - def_bool y - depends on BUG - menu "Machine selection" choice
arch/parisc/Kconfig +1 -5
@@ -27,6 +27,7 @@ config PARISC select HAVE_KERNEL_LZO select HAVE_KERNEL_XZ select GENERIC_ATOMIC64 if !64BIT + select GENERIC_BUG if BUG select GENERIC_CALIBRATE_DELAY select GENERIC_IRQ_PROBE select GENERIC_PCI_IOMAP
@@ -85,11 +86,6 @@ config ARCH_HAS_ILOG2_U64 bool default n -config GENERIC_BUG - bool - default y - depends on BUG - config GENERIC_HWEIGHT bool default y
arch/powerpc/Kconfig +1 -5
@@ -142,6 +142,7 @@ config PPC select EDAC_ATOMIC_SCRUB select EDAC_SUPPORT select GENERIC_ATOMIC64 if PPC32 + select GENERIC_BUG if BUG select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS_BROADCAST if SMP select GENERIC_CMOS_UPDATE
@@ -283,11 +284,6 @@ config AUDIT_ARCH bool default y -config GENERIC_BUG - bool - default y - depends on BUG - config SYS_SUPPORTS_APM_EMULATION default y if PMAC_APM_EMU bool
arch/riscv/Kconfig +2 -8
@@ -19,6 +19,8 @@ config RISCV select ARCH_WANT_FRAME_POINTERS select CLONE_BACKWARDS select COMMON_CLK + select GENERIC_BUG if BUG + select GENERIC_BUG_RELATIVE_POINTERS if 64BIT select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS select GENERIC_CPU_DEVICES
@@ -66,14 +68,6 @@ config PAGE_OFFSET default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB -config GENERIC_BUG - def_bool y - depends on BUG - select GENERIC_BUG_RELATIVE_POINTERS if 64BIT - -config GENERIC_BUG_RELATIVE_POINTERS - bool - config GENERIC_CSUM def_bool y
arch/s390/Kconfig +2 -6
@@ -17,12 +17,6 @@ config ARCH_HAS_ILOG2_U64 config GENERIC_HWEIGHT def_bool y -config GENERIC_BUG - def_bool y if BUG - -config GENERIC_BUG_RELATIVE_POINTERS - def_bool y - config GENERIC_LOCKBREAK def_bool y if SMP && PREEMPT
@@ -103,6 +97,8 @@ config S390 select BUILDTIME_EXTABLE_SORT select CLONE_BACKWARDS2 select DYNAMIC_FTRACE if FUNCTION_TRACER + select GENERIC_BUG if BUG + select GENERIC_BUG_RELATIVE_POINTERS select GENERIC_CLOCKEVENTS select GENERIC_CPU_AUTOPROBE select GENERIC_CPU_DEVICES if !SMP
arch/sh/Kconfig +1 -4
@@ -35,6 +35,7 @@ config SUPERH select LOCKDEP_SUPPORT select RTC_LIB select GENERIC_ATOMIC64 + select GENERIC_BUG if BUG && SUPERH32 select GENERIC_IRQ_SHOW select GENERIC_SMP_IDLE_THREAD select GENERIC_IDLE_POLL_SETUP
@@ -92,10 +93,6 @@ config ARCH_DEFCONFIG default "arch/sh/configs/shx3_defconfig" if SUPERH32 default "arch/sh/configs/cayman_defconfig" if SUPERH64 -config GENERIC_BUG - def_bool y - depends on BUG && SUPERH32 - config GENERIC_CSUM def_bool y depends on SUPERH64
arch/x86/Kconfig +2 -8
@@ -91,6 +91,8 @@ config X86 select DCACHE_WORD_ACCESS select EDAC_ATOMIC_SCRUB select EDAC_SUPPORT + select GENERIC_BUG if BUG + select GENERIC_BUG_RELATIVE_POINTERS if X86_64 select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC)
@@ -253,14 +255,6 @@ config GENERIC_ISA_DMA def_bool y depends on ISA_DMA_API -config GENERIC_BUG - def_bool y - depends on BUG - select GENERIC_BUG_RELATIVE_POINTERS if X86_64 - -config GENERIC_BUG_RELATIVE_POINTERS - bool - config GENERIC_HWEIGHT def_bool y
lib/Kconfig +6 -0
@@ -615,6 +615,12 @@ config STRING_SELFTEST endmenu +config GENERIC_BUG + bool + +config GENERIC_BUG_RELATIVE_POINTERS + bool + config GENERIC_LIB_ASHLDI3 bool
Signature · 1 line
2.20.1
Re: [PATCH 08/11] lib: consolidate the GENERIC_BUG symbol
Quoted 5 lines · Christoph Hellwig
And just let the architectures that want it select the symbol. Same for
GENERIC_BUG_RELATIVE_POINTERS.Signed-off-by Christoph Hellwig <[email protected]>
This slightly changes the behavior of GENERIC_BUG_RELATIVE_POINTERS for arm64, riscv, x86.
Previously, GENERIC_BUG_RELATIVE_POINTERS was enabled only when BUG=y.
Having said that, this is not a big deal.
When CONFIG_GENERIC_BUG=n, CONFIG_GENERIC_BUG_RELATIVE_POINTERS is actually don't care.
If you change this,
could you add some comments in commit description?
arch/arm64/Kconfig config ARM64 · line 89
Quoted 12 lines
---
arch/arm64/Kconfig +2
-0@@ -85,6 +85,8 @@ config ARM64 select FRAME_POINTER select GENERIC_ALLOCATOR select GENERIC_ARCH_TOPOLOGY + select GENERIC_BUG if BUG + select GENERIC_BUG_RELATIVE_POINTERS
Precisely,
select GENERIC_BUG_RELATIVE_POINTERS if BUG
arch/riscv/Kconfig config RISCV · line 23
Quoted 10 lines
arch/riscv/Kconfig +2
-0@@ -19,6 +19,8 @@ config RISCV select ARCH_WANT_FRAME_POINTERS select CLONE_BACKWARDS select COMMON_CLK + select GENERIC_BUG if BUG + select GENERIC_BUG_RELATIVE_POINTERS if 64BIT
Precisely,
select GENERIC_BUG_RELATIVE_POINTERS if 64BIT && BUG
Quoted 5 lines
arch/s390/Kconfig +0
-0
arch/s390/Kconfig config ARCH_HAS_ILOG2_U64 · line 25
Quoted 9 lines
arch/s390/Kconfig +0
-6@@ -17,12 +17,6 @@ config ARCH_HAS_ILOG2_U64 config GENERIC_HWEIGHT def_bool y -config GENERIC_BUG - def_bool y if BUG - -config GENERIC_BUG_RELATIVE_POINTERS - def_bool y -
Hmm, s390 enables GENERIC_BUG_RELATIVE_POINTERS
irrespective of BUG...
arch/x86/Kconfig config X86 · line 95
Quoted 10 lines
arch/x86/Kconfig +2
-0@@ -91,6 +91,8 @@ config X86 select DCACHE_WORD_ACCESS select EDAC_ATOMIC_SCRUB select EDAC_SUPPORT + select GENERIC_BUG if BUG + select GENERIC_BUG_RELATIVE_POINTERS if X86_64
Precisely,
select GENERIC_BUG_RELATIVE_POINTERS if X86_64 && BUG
--
Best Regards
Masahiro Yamada
PATCH 9/11 lib: consolidate the GENERIC_CSUM symbol
In reply to Christoph HellwigAdd one definition to lib/Kconfig and let the architectures select if it supported.
--- arch/arc/Kconfig | 4 +--- arch/arm64/Kconfig | 4 +--- arch/csky/Kconfig | 4 +--- arch/h8300/Kconfig | 4 +--- arch/hexagon/Kconfig | 4 +--- arch/m68k/Kconfig | 3 --- arch/microblaze/Kconfig | 4 +--- arch/mips/Kconfig | 5 +---- arch/nds32/Kconfig | 4 +--- arch/nios2/Kconfig | 4 +--- arch/openrisc/Kconfig | 6 +----- arch/powerpc/Kconfig | 3 --- arch/riscv/Kconfig | 4 +--- arch/sh/Kconfig | 5 +---- arch/unicore32/Kconfig | 3 --- lib/Kconfig | 3 +++ 16 files changed, 15 insertions(+), 49 deletions(-)
arch/arc/Kconfig +1 -3
@@ -20,6 +20,7 @@ config ARC select GENERIC_CALIBRATE_DELAY select GENERIC_ATOMIC64 if !ISA_ARCV2 || !(ARC_HAS_LL64 && ARC_HAS_LLSC) select GENERIC_CLOCKEVENTS + select GENERIC_CSUM select GENERIC_FIND_FIRST_BIT # for now, we don't need GENERIC_IRQ_PROBE, CONFIG_GENERIC_IRQ_CHIP select GENERIC_IRQ_SHOW
@@ -59,9 +60,6 @@ config ARCH_HAS_CACHE_LINE_SIZE config SCHED_OMIT_FRAME_POINTER def_bool y -config GENERIC_CSUM - def_bool y - config ARCH_DISCONTIGMEM_ENABLE def_bool n
arch/arm64/Kconfig +1 -3
@@ -91,6 +91,7 @@ config ARM64 select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS_BROADCAST select GENERIC_CPU_AUTOPROBE + select GENERIC_CSUM select GENERIC_EARLY_IOREMAP select GENERIC_IDLE_POLL_SETUP select GENERIC_IRQ_MULTI_HANDLER
@@ -239,9 +240,6 @@ config ILLEGAL_POINTER_VALUE config GENERIC_HWEIGHT def_bool y -config GENERIC_CSUM - def_bool y - config ZONE_DMA32 def_bool y
arch/csky/Kconfig +1 -3
@@ -12,6 +12,7 @@ config CSKY select HANDLE_DOMAIN_IRQ select DW_APB_TIMER_OF select GENERIC_CALIBRATE_DELAY + select GENERIC_CSUM select GENERIC_LIB_ASHLDI3 select GENERIC_LIB_ASHRDI3 select GENERIC_LIB_LSHRDI3
@@ -83,9 +84,6 @@ config CPU_NO_USER_BKPT instruction exception. In kernel we parse the *regs->pc to determine whether to send SIGTRAP or not. -config GENERIC_CSUM - def_bool y - config GENERIC_HWEIGHT def_bool y
arch/h8300/Kconfig +1 -3
@@ -9,6 +9,7 @@ config H8300 select GENERIC_CPU_DEVICES select MODULES_USE_ELF_RELA select GENERIC_CLOCKEVENTS + select GENERIC_CSUM select CLKDEV_LOOKUP select COMMON_CLK select ARCH_WANT_FRAME_POINTERS
@@ -32,9 +33,6 @@ config GENERIC_HWEIGHT config NO_IOPORT_MAP def_bool y -config GENERIC_CSUM - def_bool y - config HZ int default 100
arch/hexagon/Kconfig +1 -3
@@ -19,6 +19,7 @@ config HEXAGON select HAVE_PERF_EVENTS # GENERIC_ALLOCATOR is used by dma_alloc_coherent() select GENERIC_ALLOCATOR + select GENERIC_CSUM select GENERIC_IRQ_SHOW select HAVE_ARCH_KGDB select HAVE_ARCH_TRACEHOOK
@@ -54,9 +55,6 @@ config EARLY_PRINTK config MMU def_bool y -config GENERIC_CSUM - def_bool y - # # Use the generic interrupt handling code in kernel/irq/: #
arch/m68k/Kconfig +0 -3
@@ -42,9 +42,6 @@ config GENERIC_HWEIGHT bool default y -config GENERIC_CSUM - bool - config TIME_LOW_RES bool default y
arch/microblaze/Kconfig +1 -3
@@ -16,6 +16,7 @@ config MICROBLAZE select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS select GENERIC_CPU_DEVICES + select GENERIC_CSUM select GENERIC_IDLE_POLL_SETUP select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW
@@ -73,9 +74,6 @@ config ARCH_HAS_ILOG2_U64 config GENERIC_HWEIGHT def_bool y -config GENERIC_CSUM - def_bool y - source "arch/microblaze/Kconfig.platform" menu "Processor type and features"
arch/mips/Kconfig +1 -4
@@ -23,6 +23,7 @@ config MIPS select GENERIC_CLOCKEVENTS select GENERIC_CMOS_UPDATE select GENERIC_CPU_AUTOPROBE + select GENERIC_CSUM if !CPU_HAS_LOAD_STORE_LR select GENERIC_IOMAP select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW
@@ -1146,10 +1147,6 @@ config MIPS_MACHINE config NO_IOPORT_MAP def_bool n -config GENERIC_CSUM - bool - default y if !CPU_HAS_LOAD_STORE_LR - config GENERIC_ISA_DMA bool select ZONE_DMA if GENERIC_ISA_DMA_SUPPORT_BROKEN=n
arch/nds32/Kconfig +1 -3
@@ -15,6 +15,7 @@ config NDS32 select GENERIC_CALIBRATE_DELAY select GENERIC_CPU_DEVICES select GENERIC_CLOCKEVENTS + select GENERIC_CSUM select GENERIC_IRQ_CHIP select GENERIC_IRQ_SHOW select GENERIC_LIB_ASHLDI3
@@ -49,9 +50,6 @@ config NDS32 help Andes(nds32) Linux support. -config GENERIC_CSUM - def_bool y - config GENERIC_HWEIGHT def_bool y
arch/nios2/Kconfig +1 -3
@@ -9,6 +9,7 @@ config NIOS2 select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS select GENERIC_CPU_DEVICES + select GENERIC_CSUM select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW select GENERIC_STRNCPY_FROM_USER
@@ -26,9 +27,6 @@ config NIOS2 select CPU_NO_EFFICIENT_FFS select ARCH_DISCARD_MEMBLOCK -config GENERIC_CSUM - def_bool y - config GENERIC_HWEIGHT def_bool y
arch/openrisc/Kconfig +1 -5
@@ -23,6 +23,7 @@ config OPENRISC select GENERIC_ATOMIC64 select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS_BROADCAST + select GENERIC_CSUM select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNLEN_USER select GENERIC_SMP_IDLE_THREAD
@@ -51,11 +52,6 @@ config GENERIC_HWEIGHT config NO_IOPORT_MAP def_bool y -# For now, use generic checksum functions -#These can be reimplemented in assembly later if so inclined -config GENERIC_CSUM - def_bool y - menu "Processor type and features" choice
arch/powerpc/Kconfig +0 -3
@@ -237,9 +237,6 @@ config PPC_BARRIER_NOSPEC default y depends on PPC_BOOK3S_64 || PPC_FSL_BOOK3E -config GENERIC_CSUM - def_bool n - config EARLY_PRINTK bool default y
arch/riscv/Kconfig +1 -3
@@ -24,6 +24,7 @@ config RISCV select GENERIC_CALIBRATE_DELAY select GENERIC_CLOCKEVENTS select GENERIC_CPU_DEVICES + select GENERIC_CSUM select GENERIC_IRQ_SHOW select GENERIC_PCI_IOMAP select GENERIC_SCHED_CLOCK
@@ -68,9 +69,6 @@ config PAGE_OFFSET default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB -config GENERIC_CSUM - def_bool y - config GENERIC_HWEIGHT def_bool y
arch/sh/Kconfig +1 -4
@@ -85,6 +85,7 @@ config SUPERH32 config SUPERH64 def_bool "$(ARCH)" = "sh64" + select GENERIC_CSUM select HAVE_EXIT_THREAD select KALLSYMS
@@ -93,10 +94,6 @@ config ARCH_DEFCONFIG default "arch/sh/configs/shx3_defconfig" if SUPERH32 default "arch/sh/configs/cayman_defconfig" if SUPERH64 -config GENERIC_CSUM - def_bool y - depends on SUPERH64 - config GENERIC_HWEIGHT def_bool y
arch/unicore32/Kconfig +0 -3
@@ -29,9 +29,6 @@ config UNICORE32 designs licensed by PKUnity Ltd. Please see web page at <http://www.pkunity.com/>. -config GENERIC_CSUM - def_bool y - config NO_IOPORT_MAP bool
lib/Kconfig +3 -0
@@ -32,6 +32,9 @@ config HAVE_ARCH_BITREVERSE config RATIONAL bool +config GENERIC_CSUM + bool + config GENERIC_STRNCPY_FROM_USER bool
Signature · 1 line
2.20.1
Re: [PATCH 09/11] lib: consolidate the GENERIC_CSUM symbol
Quoted 6 lines · Christoph Hellwig
Add one definition to lib/Kconfig and let the architectures select if it supported.
Signed-off-by Christoph Hellwig <[email protected]>arch/m68k/Kconfig | 3 ---
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH 09/11] lib: consolidate the GENERIC_CSUM symbol
In reply to Christoph HellwigQuoted 13 lines · Christoph Hellwig
Add one definition to lib/Kconfig and let the architectures select if it supported.
Signed-off-by Christoph Hellwig <[email protected]>arch/unicore32/Kconfig +0
-0
arch/unicore32/Kconfig config UNICORE32 · line 34
Quoted 9 lines
arch/unicore32/Kconfig +0
-3@@ -29,9 +29,6 @@ config UNICORE32 designs licensed by PKUnity Ltd. Please see web page at <http://www.pkunity.com/>. -config GENERIC_CSUM - def_bool y - config NO_IOPORT_MAP bool
You missed to add 'select GENERIC_CSUM' for unicore32.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 10/11 lib: consolidate the GENERIC_HWEIGHT symbol
In reply to Christoph HellwigIntroduce a new ARCH_HAS_HWEIGHT symbol for alpha and ia64, and just default to the generic version otherwise.
--- arch/alpha/Kconfig | 5 +---- arch/arc/Kconfig | 3 --- arch/arm/Kconfig | 4 ---- arch/arm64/Kconfig | 3 --- arch/c6x/Kconfig | 3 --- arch/csky/Kconfig | 3 --- arch/h8300/Kconfig | 3 --- arch/hexagon/Kconfig | 3 --- arch/ia64/Kconfig | 1 + arch/m68k/Kconfig | 4 ---- arch/microblaze/Kconfig | 3 --- arch/mips/Kconfig | 4 ---- arch/nds32/Kconfig | 3 --- arch/nios2/Kconfig | 3 --- arch/openrisc/Kconfig | 3 --- arch/parisc/Kconfig | 4 ---- arch/powerpc/Kconfig | 4 ---- arch/riscv/Kconfig | 3 --- arch/s390/Kconfig | 3 --- arch/sh/Kconfig | 3 --- arch/sparc/Kconfig | 4 ---- arch/unicore32/Kconfig | 3 --- arch/x86/Kconfig | 3 --- arch/x86/um/Kconfig | 3 --- arch/xtensa/Kconfig | 3 --- lib/Kconfig | 7 +++++++ 26 files changed, 9 insertions(+), 79 deletions(-)
arch/alpha/Kconfig +1 -4
@@ -2,6 +2,7 @@ config ALPHA bool default y + select ARCH_HAS_HWEIGHT if ALPHA_EV67 select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO select ARCH_NO_PREEMPT
@@ -446,10 +447,6 @@ config ALPHA_IRONGATE depends on ALPHA_NAUTILUS default y -config GENERIC_HWEIGHT - bool - default y if !ALPHA_EV67 - config ALPHA_AVANTI bool depends on ALPHA_XL || ALPHA_AVANTI_CH
arch/arc/Kconfig +0 -3
@@ -72,9 +72,6 @@ config MMU config NO_IOPORT_MAP def_bool y -config GENERIC_HWEIGHT - def_bool y - config HAVE_ARCH_TRANSPARENT_HUGEPAGE def_bool y depends on ARC_MMU_V4
arch/arm/Kconfig +0 -4
@@ -182,10 +182,6 @@ config ARCH_HAS_BANDGAP config FIX_EARLYCON_MEM def_bool y if MMU -config GENERIC_HWEIGHT - bool - default y - config ARCH_MAY_HAVE_PC_FDC bool
arch/arm64/Kconfig +0 -3
@@ -237,9 +237,6 @@ config ILLEGAL_POINTER_VALUE hex default 0xdead000000000000 -config GENERIC_HWEIGHT - def_bool y - config ZONE_DMA32 def_bool y
arch/c6x/Kconfig +0 -3
@@ -28,9 +28,6 @@ config MMU config FPU def_bool n -config GENERIC_HWEIGHT - def_bool y - config C6X_BIG_KERNEL bool "Build a big kernel" help
arch/csky/Kconfig +0 -3
@@ -84,9 +84,6 @@ config CPU_NO_USER_BKPT instruction exception. In kernel we parse the *regs->pc to determine whether to send SIGTRAP or not. -config GENERIC_HWEIGHT - def_bool y - config MMU def_bool y
arch/h8300/Kconfig +0 -3
@@ -27,9 +27,6 @@ config H8300 config CPU_BIG_ENDIAN def_bool y -config GENERIC_HWEIGHT - def_bool y - config NO_IOPORT_MAP def_bool y
arch/hexagon/Kconfig +0 -3
@@ -61,9 +61,6 @@ config MMU config GENERIC_IRQ_PROBE def_bool y -config GENERIC_HWEIGHT - def_bool y - menu "Machine selection" choice
arch/ia64/Kconfig +1 -0
@@ -8,6 +8,7 @@ menu "Processor type and features" config IA64 bool + select ARCH_HAS_HWEIGHT select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO select ACPI if (!IA64_HP_SIM)
arch/m68k/Kconfig +0 -4
@@ -38,10 +38,6 @@ config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U64 bool -config GENERIC_HWEIGHT - bool - default y - config TIME_LOW_RES bool default y
arch/microblaze/Kconfig +0 -3
@@ -71,9 +71,6 @@ config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U64 def_bool n -config GENERIC_HWEIGHT - def_bool y - source "arch/microblaze/Kconfig.platform" menu "Processor type and features"
arch/mips/Kconfig +0 -4
@@ -1042,10 +1042,6 @@ source "arch/mips/paravirt/Kconfig" endmenu -config GENERIC_HWEIGHT - bool - default y - config SCHED_OMIT_FRAME_POINTER bool default y
arch/nds32/Kconfig +0 -3
@@ -50,9 +50,6 @@ config NDS32 help Andes(nds32) Linux support. -config GENERIC_HWEIGHT - def_bool y - config GENERIC_LOCKBREAK def_bool y depends on PREEMPT
arch/nios2/Kconfig +0 -3
@@ -27,9 +27,6 @@ config NIOS2 select CPU_NO_EFFICIENT_FFS select ARCH_DISCARD_MEMBLOCK -config GENERIC_HWEIGHT - def_bool y - config NO_IOPORT_MAP def_bool y
arch/openrisc/Kconfig +0 -3
@@ -46,9 +46,6 @@ config CPU_BIG_ENDIAN config MMU def_bool y -config GENERIC_HWEIGHT - def_bool y - config NO_IOPORT_MAP def_bool y
arch/parisc/Kconfig +0 -4
@@ -86,10 +86,6 @@ config ARCH_HAS_ILOG2_U64 bool default n -config GENERIC_HWEIGHT - bool - default y - config TIME_LOW_RES bool depends on SMP
arch/powerpc/Kconfig +0 -4
@@ -96,10 +96,6 @@ config GENERIC_LOCKBREAK default y depends on SMP && PREEMPT -config GENERIC_HWEIGHT - bool - default y - config ARCH_HAS_DMA_SET_COHERENT_MASK bool
arch/riscv/Kconfig +0 -3
@@ -69,9 +69,6 @@ config PAGE_OFFSET default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB -config GENERIC_HWEIGHT - def_bool y - config PGTABLE_LEVELS int default 3 if 64BIT
arch/s390/Kconfig +0 -3
@@ -14,9 +14,6 @@ config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U64 def_bool n -config GENERIC_HWEIGHT - def_bool y - config GENERIC_LOCKBREAK def_bool y if SMP && PREEMPT
arch/sh/Kconfig +0 -3
@@ -94,9 +94,6 @@ config ARCH_DEFCONFIG default "arch/sh/configs/shx3_defconfig" if SUPERH32 default "arch/sh/configs/cayman_defconfig" if SUPERH64 -config GENERIC_HWEIGHT - def_bool y - config GENERIC_LOCKBREAK def_bool y depends on SMP && PREEMPT
arch/sparc/Kconfig +0 -4
@@ -187,10 +187,6 @@ config NR_CPUS source "kernel/Kconfig.hz" -config GENERIC_HWEIGHT - bool - default y - config ARCH_MAY_HAVE_PC_FDC bool default y
arch/unicore32/Kconfig +0 -3
@@ -38,9 +38,6 @@ config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U64 bool -config GENERIC_HWEIGHT - def_bool y - config ARCH_MAY_HAVE_PC_FDC bool
arch/x86/Kconfig +0 -3
@@ -255,9 +255,6 @@ config GENERIC_ISA_DMA def_bool y depends on ISA_DMA_API -config GENERIC_HWEIGHT - def_bool y - config ARCH_MAY_HAVE_PC_FDC def_bool y depends on ISA_DMA_API
arch/x86/um/Kconfig +0 -3
@@ -49,6 +49,3 @@ config ARCH_HAS_SC_SIGNALS config ARCH_REUSE_HOST_VSYSCALL_AREA def_bool !64BIT - -config GENERIC_HWEIGHT - def_bool y
arch/xtensa/Kconfig +0 -3
@@ -47,9 +47,6 @@ config XTENSA with reasonable minimum requirements. The Xtensa Linux project has a home page at <http://www.linux-xtensa.org/>. -config GENERIC_HWEIGHT - def_bool y - config ARCH_HAS_ILOG2_U32 def_bool n
lib/Kconfig +7 -0
@@ -35,6 +35,13 @@ config RATIONAL config GENERIC_CSUM bool +config ARCH_HAS_HWEIGHT + bool + +config GENERIC_HWEIGHT + default y if !ARCH_HAS_HWEIGHT + bool + config GENERIC_STRNCPY_FROM_USER bool
Signature · 1 line
2.20.1
Re: [PATCH 10/11] lib: consolidate the GENERIC_HWEIGHT symbol
Quoted 6 lines · Christoph Hellwig
Introduce a new
ARCH_HAS_HWEIGHTsymbol for alpha and ia64, and just default to the generic version otherwise.Signed-off-by Christoph Hellwig <[email protected]>arch/m68k/Kconfig | 4 ----
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH 10/11] lib: consolidate the GENERIC_HWEIGHT symbol
In reply to Christoph HellwigQuoted 2 lines · Christoph Hellwig
Introduce a new
ARCH_HAS_HWEIGHTsymbol for alpha and ia64,
I think this is really confusing.
"ARCH has its own optimized hweight implementation"
is not equivalent to
"ARCH does not need generic hweight at all".
For example, see
arch/powerpc/lib/hweight_64.S
As far as I understood the code,
it will fallback to generic lib/hweight.c if it turns out the optimized one is not available.
Thanks.
Quoted 415 lines
and just
default to the generic version otherwise.Signed-off-by Christoph Hellwig <[email protected]>--- arch/alpha/Kconfig | 5 +---- arch/arc/Kconfig | 3 --- arch/arm/Kconfig | 4 ---- arch/arm64/Kconfig | 3 --- arch/c6x/Kconfig | 3 --- arch/csky/Kconfig | 3 --- arch/h8300/Kconfig | 3 --- arch/hexagon/Kconfig | 3 --- arch/ia64/Kconfig | 1 + arch/m68k/Kconfig | 4 ---- arch/microblaze/Kconfig | 3 --- arch/mips/Kconfig | 4 ---- arch/nds32/Kconfig | 3 --- arch/nios2/Kconfig | 3 --- arch/openrisc/Kconfig | 3 --- arch/parisc/Kconfig | 4 ---- arch/powerpc/Kconfig | 4 ---- arch/riscv/Kconfig | 3 --- arch/s390/Kconfig | 3 --- arch/sh/Kconfig | 3 --- arch/sparc/Kconfig | 4 ---- arch/unicore32/Kconfig | 3 --- arch/x86/Kconfig | 3 --- arch/x86/um/Kconfig | 3 --- arch/xtensa/Kconfig | 3 --- lib/Kconfig | 7 +++++++ 26 files changed, 9 insertions(+), 79 deletions(-)arch/alpha/Kconfig +1
-4@@ -2,6 +2,7 @@ config ALPHA bool default y + select ARCH_HAS_HWEIGHT if ALPHA_EV67 select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO select ARCH_NO_PREEMPT@@ -446,10 +447,6 @@ config ALPHA_IRONGATE depends on ALPHA_NAUTILUS default y -config GENERIC_HWEIGHT - bool - default y if !ALPHA_EV67 - config ALPHA_AVANTI bool depends on ALPHA_XL || ALPHA_AVANTI_CHarch/arc/Kconfig +0
-3@@ -72,9 +72,6 @@ config MMU config NO_IOPORT_MAP def_bool y -config GENERIC_HWEIGHT - def_bool y - config HAVE_ARCH_TRANSPARENT_HUGEPAGE def_bool y depends on ARC_MMU_V4arch/arm/Kconfig +0
-4@@ -182,10 +182,6 @@ config ARCH_HAS_BANDGAP config FIX_EARLYCON_MEM def_bool y if MMU -config GENERIC_HWEIGHT - bool - default y - config ARCH_MAY_HAVE_PC_FDC boolarch/arm64/Kconfig +0
-3@@ -237,9 +237,6 @@ config ILLEGAL_POINTER_VALUE hex default 0xdead000000000000 -config GENERIC_HWEIGHT - def_bool y - config ZONE_DMA32 def_bool yarch/c6x/Kconfig +0
-3@@ -28,9 +28,6 @@ config MMU config FPU def_bool n -config GENERIC_HWEIGHT - def_bool y - config C6X_BIG_KERNEL bool "Build a big kernel" helparch/csky/Kconfig +0
-3@@ -84,9 +84,6 @@ config CPU_NO_USER_BKPT instruction exception. In kernel we parse the *regs->pc to determine whether to send SIGTRAP or not. -config GENERIC_HWEIGHT - def_bool y - config MMU def_bool yarch/h8300/Kconfig +0
-3@@ -27,9 +27,6 @@ config H8300 config CPU_BIG_ENDIAN def_bool y -config GENERIC_HWEIGHT - def_bool y - config NO_IOPORT_MAP def_bool yarch/hexagon/Kconfig +0
-3@@ -61,9 +61,6 @@ config MMU config GENERIC_IRQ_PROBE def_bool y -config GENERIC_HWEIGHT - def_bool y - menu "Machine selection" choicearch/ia64/Kconfig +1
-0@@ -8,6 +8,7 @@ menu "Processor type and features" config IA64 bool + select ARCH_HAS_HWEIGHT select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO select ACPI if (!IA64_HP_SIM)arch/m68k/Kconfig +0
-4@@ -38,10 +38,6 @@ config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U64 bool -config GENERIC_HWEIGHT - bool - default y - config TIME_LOW_RES bool default yarch/microblaze/Kconfig +0
-3@@ -71,9 +71,6 @@ config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U64 def_bool n -config GENERIC_HWEIGHT - def_bool y - source "arch/microblaze/Kconfig.platform" menu "Processor type and features"arch/mips/Kconfig +0
-4@@ -1042,10 +1042,6 @@ source "arch/mips/paravirt/Kconfig" endmenu -config GENERIC_HWEIGHT - bool - default y - config SCHED_OMIT_FRAME_POINTER bool default yarch/nds32/Kconfig +0
-3@@ -50,9 +50,6 @@ config NDS32 help Andes(nds32) Linux support. -config GENERIC_HWEIGHT - def_bool y - config GENERIC_LOCKBREAK def_bool y depends on PREEMPTarch/nios2/Kconfig +0
-3@@ -27,9 +27,6 @@ config NIOS2 select CPU_NO_EFFICIENT_FFS select ARCH_DISCARD_MEMBLOCK -config GENERIC_HWEIGHT - def_bool y - config NO_IOPORT_MAP def_bool yarch/openrisc/Kconfig +0
-3@@ -46,9 +46,6 @@ config CPU_BIG_ENDIAN config MMU def_bool y -config GENERIC_HWEIGHT - def_bool y - config NO_IOPORT_MAP def_bool yarch/parisc/Kconfig +0
-4@@ -86,10 +86,6 @@ config ARCH_HAS_ILOG2_U64 bool default n -config GENERIC_HWEIGHT - bool - default y - config TIME_LOW_RES bool depends on SMParch/powerpc/Kconfig +0
-4@@ -96,10 +96,6 @@ config GENERIC_LOCKBREAK default y depends on SMP && PREEMPT -config GENERIC_HWEIGHT - bool - default y - config ARCH_HAS_DMA_SET_COHERENT_MASK boolarch/riscv/Kconfig +0
-3@@ -69,9 +69,6 @@ config PAGE_OFFSET default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB -config GENERIC_HWEIGHT - def_bool y - config PGTABLE_LEVELS int default 3 if 64BITarch/s390/Kconfig +0
-3@@ -14,9 +14,6 @@ config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U64 def_bool n -config GENERIC_HWEIGHT - def_bool y - config GENERIC_LOCKBREAK def_bool y if SMP && PREEMPTarch/sh/Kconfig +0
-3@@ -94,9 +94,6 @@ config ARCH_DEFCONFIG default "arch/sh/configs/shx3_defconfig" if SUPERH32 default "arch/sh/configs/cayman_defconfig" if SUPERH64 -config GENERIC_HWEIGHT - def_bool y - config GENERIC_LOCKBREAK def_bool y depends on SMP && PREEMPTarch/sparc/Kconfig +0
-4@@ -187,10 +187,6 @@ config NR_CPUS source "kernel/Kconfig.hz" -config GENERIC_HWEIGHT - bool - default y - config ARCH_MAY_HAVE_PC_FDC bool default yarch/unicore32/Kconfig +0
-3@@ -38,9 +38,6 @@ config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U64 bool -config GENERIC_HWEIGHT - def_bool y - config ARCH_MAY_HAVE_PC_FDC boolarch/x86/Kconfig +0
-3@@ -255,9 +255,6 @@ config GENERIC_ISA_DMA def_bool y depends on ISA_DMA_API -config GENERIC_HWEIGHT - def_bool y - config ARCH_MAY_HAVE_PC_FDC def_bool y depends on ISA_DMA_APIarch/x86/um/Kconfig +0
-3@@ -49,6 +49,3 @@ config ARCH_HAS_SC_SIGNALS config ARCH_REUSE_HOST_VSYSCALL_AREA def_bool !64BIT - -config GENERIC_HWEIGHT - def_bool yarch/xtensa/Kconfig +0
-3@@ -47,9 +47,6 @@ config XTENSA with reasonable minimum requirements. The Xtensa Linux project has a home page at <http://www.linux-xtensa.org/>. -config GENERIC_HWEIGHT - def_bool y - config ARCH_HAS_ILOG2_U32 def_bool nlib/Kconfig +7
-1@@ -35,6 +35,13 @@ config RATIONAL config GENERIC_CSUM bool +config ARCH_HAS_HWEIGHT + bool + +config GENERIC_HWEIGHT + default y if !ARCH_HAS_HWEIGHT + bool + config GENERIC_STRNCPY_FROM_USER bool --2.20.1
Quoted 4 lines
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
--
Best Regards
Masahiro Yamada
PATCH 11/11 s390: don't redefined the HAS_IOMEM symbol
In reply to Christoph HellwigRely on the common defintion instead.
--- arch/s390/Kconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/s390/Kconfig +1 -3
@@ -159,6 +159,7 @@ config S390 select MODULES_USE_ELF_RELA select NEED_DMA_MAP_STATE if PCI select NEED_SG_DMA_LENGTH if PCI + select NO_IOMEM if !PCI select OLD_SIGACTION select OLD_SIGSUSPEND3 select PCI_DOMAINS if PCI
@@ -708,9 +709,6 @@ config PCI_NR_FUNCTIONS endif # PCI -config HAS_IOMEM - def_bool PCI - config CHSC_SCH def_tristate m prompt "Support for CHSC subchannels"
Signature · 1 line
2.20.1
Re: [PATCH 11/11] s390: don't redefined the HAS_IOMEM symbol
Quoted 13 lines · Christoph Hellwig
Rely on the common defintion instead.
Signed-off-by Christoph Hellwig <[email protected]>--- arch/s390/Kconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)arch/s390/Kconfig +0
-0
arch/s390/Kconfig config S390 · line 162
Quoted 4 lines
arch/s390/Kconfig +1
-0@@ -159,6 +159,7 @@ config S390 select MODULES_USE_ELF_RELA select NEED_DMA_MAP_STATE if PCI select NEED_SG_DMA_LENGTH if PCI + select NO_IOMEM if !PCI
This does not work because NO_IOMEM is defined
in arch/um/Kconfig.
If you want to do this,
you must move NO_IOMEM to lib/Kconfig.
Quoted 21 lines
arch/s390/Kconfig +0
-4select OLD_SIGACTION select OLD_SIGSUSPEND3 select PCI_DOMAINS if PCI@@ -708,9 +709,6 @@ config PCI_NR_FUNCTIONS endif # PCI -config HAS_IOMEM - def_bool PCI - config CHSC_SCH def_tristate m prompt "Support for CHSC subchannels" --2.20.1
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Signature · 2 lines
Best Regards Masahiro Yamada