linux-toradex.git/include/asm-generic/atomic.h, branch v3.0-rc3

Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2010-10-22T18:17:06+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic/io.h: allow people to override individual funcs
  bitops: remove duplicated extern declarations
  bitops: make asm-generic/bitops/find.h more generic
  asm-generic: kdebug.h: Checkpatch cleanup
  asm-generic: fcntl: make exported headers use strict posix types
  asm-generic: cmpxchg does not handle non-long arguments
  asm-generic: make atomic_add_unless a function

asm-generic: make atomic_add_unless a function

2010-10-09T19:36:35+00:00

atomic_add_unless is a macro so, bad things happen if the caller defines
a local variable named c, just like like the local variable c defined by
the macro. Thus, convert atomic_add_unless to a function. (bug triggered
by net/ipv4/netfilter/ipt_CLUSTERIP.c: clusterip_config_find_get calls
atomic_inc_not_zero)

Signed-off-by: Mathieu Lacage 
Signed-off-by: Arnd Bergmann

Fix IRQ flag handling naming

2010-10-07T13:08:55+00:00

Fix the IRQ flag handling naming.  In linux/irqflags.h under one configuration,
it maps:

	local_irq_enable() -> raw_local_irq_enable()
	local_irq_disable() -> raw_local_irq_disable()
	local_irq_save() -> raw_local_irq_save()
	...

and under the other configuration, it maps:

	raw_local_irq_enable() -> local_irq_enable()
	raw_local_irq_disable() -> local_irq_disable()
	raw_local_irq_save() -> local_irq_save()
	...

This is quite confusing.  There should be one set of names expected of the
arch, and this should be wrapped to give another set of names that are expected
by users of this facility.

Change this to have the arch provide:

	flags = arch_local_save_flags()
	flags = arch_local_irq_save()
	arch_local_irq_restore(flags)
	arch_local_irq_disable()
	arch_local_irq_enable()
	arch_irqs_disabled_flags(flags)
	arch_irqs_disabled()
	arch_safe_halt()

Then linux/irqflags.h wraps these to provide:

	raw_local_save_flags(flags)
	raw_local_irq_save(flags)
	raw_local_irq_restore(flags)
	raw_local_irq_disable()
	raw_local_irq_enable()
	raw_irqs_disabled_flags(flags)
	raw_irqs_disabled()
	raw_safe_halt()

with type checking on the flags 'arguments', and then wraps those to provide:

	local_save_flags(flags)
	local_irq_save(flags)
	local_irq_restore(flags)
	local_irq_disable()
	local_irq_enable()
	irqs_disabled_flags(flags)
	irqs_disabled()
	safe_halt()

with tracing included if enabled.

The arch functions can now all be inline functions rather than some of them
having to be macros.

Signed-off-by: David Howells  [X86, FRV, MN10300]
Signed-off-by: Chris Metcalf  [Tile]
Signed-off-by: Michal Simek  [Microblaze]
Tested-by: Catalin Marinas  [ARM]
Acked-by: Thomas Gleixner 
Acked-by: Haavard Skinnemoen  [AVR]
Acked-by: Tony Luck  [IA-64]
Acked-by: Hirokazu Takata  [M32R]
Acked-by: Greg Ungerer  [M68K/M68KNOMMU]
Acked-by: Ralf Baechle  [MIPS]
Acked-by: Kyle McMartin  [PA-RISC]
Acked-by: Paul Mackerras  [PowerPC]
Acked-by: Martin Schwidefsky  [S390]
Acked-by: Chen Liqin  [Score]
Acked-by: Matt Fleming  [SH]
Acked-by: David S. Miller  [Sparc]
Acked-by: Chris Zankel  [Xtensa]
Reviewed-by: Richard Henderson  [Alpha]
Reviewed-by: Yoshinori Sato  [H8300]
Cc: starvik@axis.com [CRIS]
Cc: jesper.nilsson@axis.com [CRIS]
Cc: linux-cris-kernel@axis.com

asm-generic: use raw_local_irq_save/restore instead local_irq_save/restore

2010-08-10T03:44:54+00:00

The start/stop_critical_timing functions for preemptirqsoff, preemptoff
and irqsoff tracers contain atomic_inc() and atomic_dec() operations.

Atomic operations use local_irq_save/restore macros to ensure atomic
access but they are traced by the same function which is causing recursion
problem.

The reason is when these tracers are turn ON then the
local_irq_save/restore macros are changed in include/linux/irqflags.h to
call trace_hardirqs_on/off which call start/stop_critical_timing.

Microblaze was affected because it uses generic atomic implementation.

Signed-off-by: Michal Simek 
Acked-by: Steven Rostedt 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

asm-generic: don't warn that atomic_t is only 24 bit

2010-05-25T15:07:03+00:00

32-bit Sparc used to only allow usage of 24-bit of it's atomic_t type.
This was corrected with linux 2.6.3 when Keith M Wesolowski changed the
implementation to use the parisc approach of having an array of spinlocks
to protect the atomic_t.

These warnings were also removed from the sparc implementation when the
new implementation was merged in BKrev:402e4949VThdc6D3iaosSFUgabMfvw, but
the warning still remained in some other places without any 24-bit-only
atomic_t implementation inside the kernel.

We should remove these warnings to allow users to rely on the full 32-bit
range of atomic_t.

Signed-off-by: Peter Fritzsche 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

atomic_t: Cast to volatile when accessing atomic variables

2010-05-17T14:57:27+00:00

In preparation for removing volatile from the atomic_t definition, this
patch adds a volatile cast to all the atomic read functions.

Signed-off-by: Anton Blanchard 
Signed-off-by: Linus Torvalds

asm-generic: add generic atomic.h and io.h

2009-06-11T19:02:49+00:00

atomic.h and io.h are based on the mn10300 architecture,
which is already pretty generic and can be used by
other architectures that do not have hardware support
for atomic operations or out-of-order I/O access.

Signed-off-by: Arnd Bergmann

asm-generic: rename atomic.h to atomic-long.h

2009-06-11T19:02:17+00:00

The existing asm-generic/atomic.h only defines the
atomic_long type. This renames it to atomic-long.h
so we have a place to add a truly generic atomic.h
that can be used on all non-SMP systems.

Signed-off-by: Remis Lima Baima 
Signed-off-by: Arnd Bergmann 
Acked-by: Ingo Molnar

atomic: fix atomic_long_cmpxchg/xchg for 64 bit architectures

2009-05-02T22:36:09+00:00

On a linux-next allyesconfig build:

kernel/trace/ring_buffer.c:1726:
	warning: passing argument 1 of 'atomic_cmpxchg' from incompatible pointer type
linux-next/arch/s390/include/asm/atomic.h:112:
	note: expected 'struct atomic_t *' but argument is of type 'struct atomic64_t *'

atomic_long_cmpxchg and atomic_long_xchg are incorrectly defined for 64
bit architectures.  They should be mapped to the atomic64_* variants.

Acked-by: Mathieu Desnoyers 
Signed-off-by: Heiko Carstens 
Acked-by: Ingo Molnar 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

atomic: fix a typo in atomic_long_xchg()

2008-12-10T16:01:53+00:00

atomic_long_xchg() is not correctly defined for 32bit arches.

Signed-off-by: Eric Dumazet 
Cc: Mathieu Desnoyers 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds