Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

atomic64: no need for CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

This came to light when implementing native 64-bit atomics for ARCv2.

The atomic64 self-test code uses CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
to check whether atomic64_dec_if_positive() is available.  It seems it
was needed when not every arch defined it.  However as of current code
the Kconfig option seems needless

 - for CONFIG_GENERIC_ATOMIC64 it is auto-enabled in lib/Kconfig and a
   generic definition of API is present lib/atomic64.c
 - arches with native 64-bit atomics select it in arch/*/Kconfig and
   define the API in their headers

So I see no point in keeping the Kconfig option

Compile tested for:
 - blackfin (CONFIG_GENERIC_ATOMIC64)
 - x86 (!CONFIG_GENERIC_ATOMIC64)
 - ia64

Link: http://lkml.kernel.org/r/1473703083-8625-3-git-send-email-vgupta@synopsys.com
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Metcalf <cmetcalf@mellanox.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Zhaoxiu Zeng <zhaoxiu.zeng@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Ming Lin <ming.l@ssi.samsung.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@suse.de>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Vineet Gupta 8 years ago
parent
445ed0a0ea
commit
51a021244b
12 changed files with 0 additions and 17 deletions
Unified View Show Diff Stats
  1. 0 1
      arch/alpha/Kconfig
  2. 0 1
      arch/arm/Kconfig
  3. 0 1
      arch/arm64/Kconfig
  4. 0 1
      arch/mips/Kconfig
  5. 0 1
      arch/parisc/Kconfig
  6. 0 1
      arch/powerpc/Kconfig
  7. 0 1
      arch/s390/Kconfig
  8. 0 1
      arch/sparc/Kconfig
  9. 0 1
      arch/tile/Kconfig
  10. 0 1
      arch/x86/Kconfig
  11. 0 3
      lib/Kconfig
  12. 0 4
      lib/atomic64_test.c

+ 0 - 1
arch/alpha/Kconfig
View File 

@@ -15,7 +15,6 @@ config ALPHA
 
 	select GENERIC_IRQ_SHOW
 
 	select GENERIC_IRQ_SHOW
 
 	select ARCH_WANT_IPC_PARSE_VERSION
 
 	select ARCH_WANT_IPC_PARSE_VERSION
 
 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
 
 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
 
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 
 	select AUDIT_ARCH
 
 	select AUDIT_ARCH
 
 	select GENERIC_CLOCKEVENTS
 
 	select GENERIC_CLOCKEVENTS
 
 	select GENERIC_SMP_IDLE_THREAD
 
 	select GENERIC_SMP_IDLE_THREAD

+ 0 - 1
arch/arm/Kconfig
View File 

@@ -2,7 +2,6 @@ config ARM
 
 	bool
 
 	bool
 
 	default y
 
 	default y
 
 	select ARCH_CLOCKSOURCE_DATA
 
 	select ARCH_CLOCKSOURCE_DATA
 
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 
 	select ARCH_HAS_ELF_RANDOMIZE
 
 	select ARCH_HAS_ELF_RANDOMIZE
 
 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
 
 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

+ 0 - 1
arch/arm64/Kconfig
View File 

@@ -8,7 +8,6 @@ config ARM64
 
 	select ARCH_CLOCKSOURCE_DATA
 
 	select ARCH_CLOCKSOURCE_DATA
 
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 
 	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
 
 	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
 
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 
 	select ARCH_HAS_ELF_RANDOMIZE
 
 	select ARCH_HAS_ELF_RANDOMIZE
 
 	select ARCH_HAS_GCOV_PROFILE_ALL
 
 	select ARCH_HAS_GCOV_PROFILE_ALL
 
 	select ARCH_HAS_GIGANTIC_PAGE
 
 	select ARCH_HAS_GIGANTIC_PAGE

+ 0 - 1
arch/mips/Kconfig
View File 

@@ -30,7 +30,6 @@ config MIPS
 
 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
 
 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
 
 	select RTC_LIB if !MACH_LOONGSON64
 
 	select RTC_LIB if !MACH_LOONGSON64
 
 	select GENERIC_ATOMIC64 if !64BIT
 
 	select GENERIC_ATOMIC64 if !64BIT
 
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 
 	select HAVE_DMA_CONTIGUOUS
 
 	select HAVE_DMA_CONTIGUOUS
 
 	select HAVE_DMA_API_DEBUG
 
 	select HAVE_DMA_API_DEBUG
 
 	select GENERIC_IRQ_PROBE
 
 	select GENERIC_IRQ_PROBE

+ 0 - 1
arch/parisc/Kconfig
View File 

@@ -14,7 +14,6 @@ config PARISC
 
 	select BUILDTIME_EXTABLE_SORT
 
 	select BUILDTIME_EXTABLE_SORT
 
 	select HAVE_PERF_EVENTS
 
 	select HAVE_PERF_EVENTS
 
 	select GENERIC_ATOMIC64 if !64BIT
 
 	select GENERIC_ATOMIC64 if !64BIT
 
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 
 	select BROKEN_RODATA
 
 	select BROKEN_RODATA
 
 	select GENERIC_IRQ_PROBE
 
 	select GENERIC_IRQ_PROBE
 
 	select GENERIC_PCI_IOMAP
 
 	select GENERIC_PCI_IOMAP

+ 0 - 1
arch/powerpc/Kconfig
View File 

@@ -113,7 +113,6 @@ config PPC
 
 	select HAVE_DEBUG_KMEMLEAK
 
 	select HAVE_DEBUG_KMEMLEAK
 
 	select ARCH_HAS_SG_CHAIN
 
 	select ARCH_HAS_SG_CHAIN
 
 	select GENERIC_ATOMIC64 if PPC32
 
 	select GENERIC_ATOMIC64 if PPC32
 
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 
 	select HAVE_PERF_EVENTS
 
 	select HAVE_PERF_EVENTS
 
 	select HAVE_PERF_REGS
 
 	select HAVE_PERF_REGS
 
 	select HAVE_PERF_USER_STACK_DUMP
 
 	select HAVE_PERF_USER_STACK_DUMP

+ 0 - 1
arch/s390/Kconfig
View File 

@@ -67,7 +67,6 @@ config DEBUG_RODATA
 
 
 
 config S390
 
 config S390
 
 	def_bool y
 
 	def_bool y
 
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 
 	select ARCH_HAS_ELF_RANDOMIZE
 
 	select ARCH_HAS_ELF_RANDOMIZE
 
 	select ARCH_HAS_GCOV_PROFILE_ALL
 
 	select ARCH_HAS_GCOV_PROFILE_ALL

+ 0 - 1
arch/sparc/Kconfig
View File 

@@ -22,7 +22,6 @@ config SPARC
 
 	select HAVE_ARCH_TRACEHOOK
 
 	select HAVE_ARCH_TRACEHOOK
 
 	select HAVE_EXIT_THREAD
 
 	select HAVE_EXIT_THREAD
 
 	select SYSCTL_EXCEPTION_TRACE
 
 	select SYSCTL_EXCEPTION_TRACE
 
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 
 	select RTC_CLASS
 
 	select RTC_CLASS
 
 	select RTC_DRV_M48T59
 
 	select RTC_DRV_M48T59
 
 	select RTC_SYSTOHC
 
 	select RTC_SYSTOHC

+ 0 - 1
arch/tile/Kconfig
View File 

@@ -3,7 +3,6 @@
 
 
 
 config TILE
 
 config TILE
 
 	def_bool y
 
 	def_bool y
 
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 
 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
 
 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
 
 	select ARCH_WANT_FRAME_POINTERS
 
 	select ARCH_WANT_FRAME_POINTERS

+ 0 - 1
arch/x86/Kconfig
View File 

@@ -23,7 +23,6 @@ config X86
 
 	select ARCH_CLOCKSOURCE_DATA
 
 	select ARCH_CLOCKSOURCE_DATA
 
 	select ARCH_DISCARD_MEMBLOCK
 
 	select ARCH_DISCARD_MEMBLOCK
 
 	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
 
 	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
 
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 
 	select ARCH_HAS_ELF_RANDOMIZE
 
 	select ARCH_HAS_ELF_RANDOMIZE
 
 	select ARCH_HAS_FAST_MULTIPLIER
 
 	select ARCH_HAS_FAST_MULTIPLIER

+ 0 - 3
lib/Kconfig
View File 

@@ -457,9 +457,6 @@ config NLATTR
 
 config GENERIC_ATOMIC64
 
 config GENERIC_ATOMIC64
 
        bool
 
        bool
 
 
 
-config ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 
-	def_bool y if GENERIC_ATOMIC64
 
-
 
 config LRU_CACHE
 
 config LRU_CACHE
 
 	tristate
 
 	tristate

+ 0 - 4
lib/atomic64_test.c
View File 

@@ -213,7 +213,6 @@ static __init void test_atomic64(void)
 
 	r += one;
 
 	r += one;
 
 	BUG_ON(v.counter != r);
 
 	BUG_ON(v.counter != r);
 
 
 
-#ifdef CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 
 	INIT(onestwos);
 
 	INIT(onestwos);
 
 	BUG_ON(atomic64_dec_if_positive(&v) != (onestwos - 1));
 
 	BUG_ON(atomic64_dec_if_positive(&v) != (onestwos - 1));
 
 	r -= one;
 
 	r -= one;
 
@@ -226,9 +225,6 @@ static __init void test_atomic64(void)
 
 	INIT(-one);
 
 	INIT(-one);
 
 	BUG_ON(atomic64_dec_if_positive(&v) != (-one - one));
 
 	BUG_ON(atomic64_dec_if_positive(&v) != (-one - one));
 
 	BUG_ON(v.counter != r);
 
 	BUG_ON(v.counter != r);
 
-#else
 
-#warning Please implement atomic64_dec_if_positive for your architecture and select the above Kconfig symbol
 
-#endif
 
 
 
 	INIT(onestwos);
 
 	INIT(onestwos);
 
 	BUG_ON(!atomic64_inc_not_zero(&v));
 
 	BUG_ON(!atomic64_inc_not_zero(&v));