diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-12 09:44:30 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-12 09:44:30 (GMT) |
| commit | f52609fdabb1c726f8b9fdf64df3161781aa186e (patch) | |
| tree | 3b7d4a47505eddb097bab848a8ffdc4bbbf79bb7 /arch/powerpc/kernel | |
| parent | 20f9ed1568c00bbd9e6af31341d25e06bc3d4a16 (diff) | |
| parent | 41b9e9fcc1c44b84a785115058ce9c703e3fca6e (diff) | |
| download | linux-f52609fdabb1c726f8b9fdf64df3161781aa186e.tar.xz | |
Merge branch 'locking/arch-atomic' into locking/core, because it's ready for upstream
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/misc_32.S | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 7c6bb4b..ed3ab50 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -596,25 +596,6 @@ _GLOBAL(copy_page) b 2b /* - * void atomic_clear_mask(atomic_t mask, atomic_t *addr) - * void atomic_set_mask(atomic_t mask, atomic_t *addr); - */ -_GLOBAL(atomic_clear_mask) -10: lwarx r5,0,r4 - andc r5,r5,r3 - PPC405_ERR77(0,r4) - stwcx. r5,0,r4 - bne- 10b - blr -_GLOBAL(atomic_set_mask) -10: lwarx r5,0,r4 - or r5,r5,r3 - PPC405_ERR77(0,r4) - stwcx. r5,0,r4 - bne- 10b - blr - -/* * Extended precision shifts. * * Updated to be valid for shift counts from 0 to 63 inclusive. |