Linus Torvalds dbb885fecc Merge branch 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ... Pull arch atomic cleanups from Ingo Molnar: "This is a series kept separate from the main locking tree, which cleans up and improves various details in the atomics type handling: - Remove the unused atomic_or_long() method - Consolidate and compress atomic ops implementations between architectures, to reduce linecount and to make it easier to add new ops. - Rewrite generic atomic support to only require cmpxchg() from an architecture - generate all other methods from that" * 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits) locking,arch: Use ACCESS_ONCE() instead of cast to volatile in atomic_read() locking, mips: Fix atomics locking, sparc64: Fix atomics locking,arch: Rewrite generic atomic support locking,arch,xtensa: Fold atomic_ops locking,arch,sparc: Fold atomic_ops locking,arch,sh: Fold atomic_ops locking,arch,powerpc: Fold atomic_ops locking,arch,parisc: Fold atomic_ops locking,arch,mn10300: Fold atomic_ops locking,arch,mips: Fold atomic_ops locking,arch,metag: Fold atomic_ops locking,arch,m68k: Fold atomic_ops locking,arch,m32r: Fold atomic_ops locking,arch,ia64: Fold atomic_ops locking,arch,hexagon: Fold atomic_ops locking,arch,cris: Fold atomic_ops locking,arch,avr32: Fold atomic_ops locking,arch,arm64: Fold atomic_ops locking,arch,arm: Fold atomic_ops ...		2014-10-13 15:48:00 +02:00
..
adc.h
addrspace.h
alignment.h
asm-offsets.h
atomic-grb.h	locking,arch,sh: Fold atomic_ops	2014-08-14 12:48:12 +02:00
atomic-irq.h	locking,arch,sh: Fold atomic_ops	2014-08-14 12:48:12 +02:00
atomic-llsc.h	locking,arch,sh: Fold atomic_ops	2014-08-14 12:48:12 +02:00
atomic.h	locking,arch: Use ACCESS_ONCE() instead of cast to volatile in atomic_read()	2014-10-03 06:06:23 +02:00
barrier.h	arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h	2014-01-12 10:37:15 +01:00
bitops-grb.h
bitops-llsc.h
bitops-op32.h
bitops.h	arch,sh: Convert smp_mb__*()	2014-04-18 14:20:44 +02:00
bl_bit_32.h
bl_bit_64.h
bl_bit.h	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers	2012-10-02 18:01:25 +01:00
bug.h	sh: Consolidate die definitions for trap handlers.	2012-06-14 14:18:51 +09:00
bugs.h
cache_insns_32.h
cache_insns_64.h
cache_insns.h	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers	2012-10-02 18:01:25 +01:00
cache.h
cacheflush.h
checksum_32.h
checksum.h	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers	2012-10-02 18:01:25 +01:00
clkdev.h	clk: Add common __clk_get(), __clk_put() implementations	2013-12-04 17:19:44 +01:00
clock.h
cmpxchg-grb.h
cmpxchg-irq.h
cmpxchg-llsc.h
cmpxchg.h
device.h
dma-mapping.h	sh: dma_debug: add debug_dma_mapping_error support	2012-11-28 15:29:00 +01:00
dma-register.h	dmaengine: shdma: Add more register documentation	2014-07-09 10:55:57 +02:00
dma.h
dmabrg.h
dwarf.h
elf.h	sh: Fix FDPIC binary loader	2013-01-11 21:02:57 +09:00
entry-macros.S
fb.h
fixmap.h	sh: use generic fixmap.h	2014-01-23 16:36:54 -08:00
flat.h
fpu.h	sh: move fpu_counter into ARCH specific thread_struct	2013-11-13 12:09:13 +09:00
freq.h
ftrace.h	ftrace: Make CALLER_ADDRx macros more generic	2014-05-21 03:10:32 -04:00
futex-irq.h
futex.h
gpio.h	sh: Remove unused sh_pfc_register_info() function	2013-01-25 09:24:30 +09:00
hardirq.h
hd64461.h
heartbeat.h
hugetlb.h	mm/hugetlb: add more arch-defined huge_pte functions	2013-04-29 15:54:33 -07:00
hw_breakpoint.h	UAPI: (Scripted) Disintegrate arch/sh/include/asm	2012-10-09 09:47:37 +01:00
hw_irq.h
i2c-sh7760.h
io_generic.h
io_noioport.h	sh: fix build error by adding generic ioport_{map/unmap}()	2014-08-06 18:01:13 -07:00
io_trapped.h	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
io.h	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
irq.h
irqflags.h
Kbuild	irq_work: Introduce arch_irq_work_has_interrupt()	2014-09-13 18:38:07 +02:00
kdebug.h	sh64: Convert to unwinder API.	2012-05-24 15:03:46 +09:00
kexec.h
kgdb.h
kmap_types.h
kprobes.h
linkage.h
machvec.h	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
mc146818rtc.h
mmu_context_32.h
mmu_context_64.h
mmu_context.h	treewide: fix "distingush" typo	2013-10-14 15:38:33 +02:00
mmu.h
mmzone.h
module.h	Make most arch asm/module.h files use asm-generic/module.h	2012-09-28 14:31:03 +09:30
mutex-llsc.h	arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not	2013-06-26 12:10:55 +02:00
mutex.h
page.h	arm64,ia64,ppc,s390,sh,tile,um,x86,mm: remove default gate area	2014-08-08 15:57:27 -07:00
pci.h	PCI: Turn pcibios_penalize_isa_irq() into a weak function	2014-05-27 16:23:58 -06:00
perf_event.h
pgalloc.h	sh: handle pgtable_page_ctor() fail	2013-11-15 09:32:18 +09:00
pgtable_32.h
pgtable_64.h
pgtable-2level.h
pgtable-3level.h
pgtable.h	consolidate io_remap_pfn_range definitions	2013-06-29 12:46:35 +04:00
posix_types.h	UAPI: (Scripted) Disintegrate arch/sh/include/asm	2012-10-09 09:47:37 +01:00
processor_32.h	sh: move fpu_counter into ARCH specific thread_struct	2013-11-13 12:09:13 +09:00
processor_64.h	sh: move fpu_counter into ARCH specific thread_struct	2013-11-13 12:09:13 +09:00
processor.h	arch, locking: Ciao arch_mutex_cpu_relax()	2014-07-17 12:32:47 +02:00
ptrace_32.h	UAPI: (Scripted) Disintegrate arch/sh/include/asm	2012-10-09 09:47:37 +01:00
ptrace_64.h	UAPI: (Scripted) Disintegrate arch/sh/include/asm	2012-10-09 09:47:37 +01:00
ptrace.h	UAPI: (Scripted) Disintegrate arch/sh/include/asm	2012-10-09 09:47:37 +01:00
push-switch.h
reboot.h
romimage-macros.h
rtc.h
rwsem.h
seccomp.h
sections.h	nosave: consolidate __nosave_{begin,end} in <asm/sections.h>	2014-10-09 22:26:04 -04:00
segment.h
setup.h	UAPI: (Scripted) Disintegrate arch/sh/include/asm	2012-10-09 09:47:37 +01:00
sfp-machine.h
sh_bios.h
sh7760fb.h
shmparam.h
siu.h	sh: remove unused DMA device pointer from SIU platform data	2012-07-20 11:23:44 +05:30
smc37c93x.h
smp-ops.h
smp.h
sparsemem.h
spi.h
spinlock_types.h
spinlock.h
sram.h
stackprotector.h
stacktrace.h
string_32.h
string_64.h
string.h	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers	2012-10-02 18:01:25 +01:00
suspend.h	SH: cpuidle: check error code at init	2013-04-22 00:35:53 +02:00
switch_to_32.h
switch_to_64.h
switch_to.h	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers	2012-10-02 18:01:25 +01:00
syscall_32.h
syscall_64.h
syscall.h	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers	2012-10-02 18:01:25 +01:00
syscalls_32.h	sh: push extra copy of r0-r2 for syscall parameters	2014-04-03 16:20:52 -07:00
syscalls_64.h	sh: switch to generic fork/vfork/clone	2012-11-28 22:36:47 -05:00
syscalls.h	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers	2012-10-02 18:01:25 +01:00
thread_info.h	preempt: Make PREEMPT_ACTIVE generic	2013-11-13 20:21:47 +01:00
timex.h
tlb_64.h
tlb.h	mm: split 'tlb_flush_mmu()' into tlb flushing and memory freeing parts	2014-04-25 16:05:40 -07:00
tlbflush.h
topology.h
traps_32.h	sh: don't pass saved userspace state to exception handlers	2014-04-03 16:20:52 -07:00
traps_64.h
traps.h	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers	2012-10-02 18:01:25 +01:00
types.h	UAPI: (Scripted) Disintegrate arch/sh/include/asm	2012-10-09 09:47:37 +01:00
uaccess_32.h	sh: use the new generic strnlen_user() function	2012-06-13 10:28:37 +09:00
uaccess_64.h	sh: use the new generic strnlen_user() function	2012-06-13 10:28:37 +09:00
uaccess.h	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers	2012-10-02 18:01:25 +01:00
unaligned-sh4a.h
unaligned.h
uncached.h
unistd.h	sys_sgetmask/sys_ssetmask: add CONFIG_SGETMASK_SYSCALL	2014-06-04 16:54:14 -07:00
unwinder.h
user.h
vga.h
vmlinux.lds.h
watchdog.h
word-at-a-time.h	sh: use the new generic strnlen_user() function	2012-06-13 10:28:37 +09:00