Merge branch 'locking/arch-atomic' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into aarch64/for-next/core

Browse source

Merge in PeterZ's logical atomic ops so that we can implement them in
our subsequent LSE atomics.

...

This commit is contained in:

Will Deacon 2015-07-27 14:21:15 +01:00

parent 772d68355e 41b9e9fcc1

commit fc9eb93cd4

65 changed files with 841 additions and 1015 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

42

arch/alpha/include/asm/atomic.h

View file

8

arch/arc/include/asm/atomic.h

View file

14

arch/arm/include/asm/atomic.h

View file

14

arch/arm64/include/asm/atomic.h

View file

12

arch/avr32/include/asm/atomic.h

View file

16

arch/blackfin/include/asm/atomic.h

View file

7

arch/blackfin/kernel/bfin_ksyms.c

View file

30

arch/blackfin/mach-bf561/atomic.S

View file

2

arch/blackfin/mach-common/smp.c

View file

109

arch/frv/include/asm/atomic.h

View file

172

arch/frv/include/asm/atomic_defs.h

View file

99

arch/frv/include/asm/bitops.h

View file

6

arch/frv/kernel/dma.c

View file

5

arch/frv/kernel/frv_ksyms.c

View file

2

arch/frv/lib/Makefile

View file

7

arch/frv/lib/atomic-lib.c

View file

110

arch/frv/lib/atomic-ops.S

View file

94

arch/frv/lib/atomic64-ops.S

View file

145

arch/h8300/include/asm/atomic.h

View file

4

arch/hexagon/include/asm/atomic.h

View file

24

arch/ia64/include/asm/atomic.h

View file

45

arch/m32r/include/asm/atomic.h

View file

4

arch/m32r/kernel/smp.c

View file

14

arch/m68k/include/asm/atomic.h

View file

38

arch/metag/include/asm/atomic_lnkget.h

View file

23

arch/metag/include/asm/atomic_lock1.h

View file

7

arch/mips/include/asm/atomic.h

View file

71

arch/mn10300/include/asm/atomic.h

View file

2

arch/mn10300/mm/tlb-smp.c

View file

7

arch/parisc/include/asm/atomic.h

View file

7

arch/powerpc/include/asm/atomic.h

View file

19

arch/powerpc/kernel/misc_32.S

View file

41

arch/s390/include/asm/atomic.h

View file

4

arch/s390/kernel/time.c

View file

30

arch/s390/kvm/interrupt.c

View file

32

arch/s390/kvm/kvm-s390.c

View file

43

arch/sh/include/asm/atomic-grb.h

View file

21

arch/sh/include/asm/atomic-irq.h

View file

31

arch/sh/include/asm/atomic-llsc.h

View file

4

arch/sparc/include/asm/atomic_32.h

View file

4

arch/sparc/include/asm/atomic_64.h

View file

22

arch/sparc/lib/atomic32.c

View file

6

arch/sparc/lib/atomic_64.S

View file

3

arch/sparc/lib/ksyms.c

View file

28

arch/tile/include/asm/atomic_32.h

View file

40

arch/tile/include/asm/atomic_64.h

View file

23

arch/tile/lib/atomic_32.c

View file

4

arch/tile/lib/atomic_asm_32.S

View file

25

arch/x86/include/asm/atomic.h

View file

14

arch/x86/include/asm/atomic64_32.h

View file

15

arch/x86/include/asm/atomic64_64.h

View file

73

arch/xtensa/include/asm/atomic.h

View file

2

drivers/gpu/drm/i915/i915_drv.c

View file

2

drivers/gpu/drm/i915/i915_gem.c

View file

4

drivers/gpu/drm/i915/i915_irq.c

View file

2

drivers/s390/scsi/zfcp_aux.c

View file

62

drivers/s390/scsi/zfcp_erp.c

View file

8

drivers/s390/scsi/zfcp_fc.c

View file

26

drivers/s390/scsi/zfcp_fsf.c

View file

14

drivers/s390/scsi/zfcp_qdio.c

View file

11

include/asm-generic/atomic.h

View file

4

include/asm-generic/atomic64.h

View file

38

include/linux/atomic.h

View file

3

lib/atomic64.c

View file

68

lib/atomic64_test.c

View file