diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2011-12-26 14:57:22 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-27 14:11:40 -0500 |
commit | 348738afe530cc3a7306bbd3d1ccd322f9638f32 (patch) | |
tree | 7ae88b2743aa8d1c0b5633b43877bd6aeecfe0c8 /arch/sparc/lib | |
parent | 371de6e4e0042adf4f9b54c414154f57414ddd37 (diff) |
sparc32: drop unused atomic24 support
atomic24 support was used to semaphores in the past - but is no longer used.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/lib')
-rw-r--r-- | arch/sparc/lib/atomic_32.S | 55 | ||||
-rw-r--r-- | arch/sparc/lib/ksyms.c | 6 |
2 files changed, 0 insertions, 61 deletions
diff --git a/arch/sparc/lib/atomic_32.S b/arch/sparc/lib/atomic_32.S index 178cbb8ae1b9..eb6c7359cbd1 100644 --- a/arch/sparc/lib/atomic_32.S +++ b/arch/sparc/lib/atomic_32.S | |||
@@ -40,60 +40,5 @@ ___xchg32_sun4md: | |||
40 | mov %g4, %o7 | 40 | mov %g4, %o7 |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | /* Read asm-sparc/atomic.h carefully to understand how this works for SMP. | ||
44 | * Really, some things here for SMP are overly clever, go read the header. | ||
45 | */ | ||
46 | .globl ___atomic24_add | ||
47 | ___atomic24_add: | ||
48 | rd %psr, %g3 ! Keep the code small, old way was stupid | ||
49 | nop; nop; nop; ! Let the bits set | ||
50 | or %g3, PSR_PIL, %g7 ! Disable interrupts | ||
51 | wr %g7, 0x0, %psr ! Set %psr | ||
52 | nop; nop; nop; ! Let the bits set | ||
53 | #ifdef CONFIG_SMP | ||
54 | 1: ldstub [%g1 + 3], %g7 ! Spin on the byte lock for SMP. | ||
55 | orcc %g7, 0x0, %g0 ! Did we get it? | ||
56 | bne 1b ! Nope... | ||
57 | ld [%g1], %g7 ! Load locked atomic24_t | ||
58 | sra %g7, 8, %g7 ! Get signed 24-bit integer | ||
59 | add %g7, %g2, %g2 ! Add in argument | ||
60 | sll %g2, 8, %g7 ! Transpose back to atomic24_t | ||
61 | st %g7, [%g1] ! Clever: This releases the lock as well. | ||
62 | #else | ||
63 | ld [%g1], %g7 ! Load locked atomic24_t | ||
64 | add %g7, %g2, %g2 ! Add in argument | ||
65 | st %g2, [%g1] ! Store it back | ||
66 | #endif | ||
67 | wr %g3, 0x0, %psr ! Restore original PSR_PIL | ||
68 | nop; nop; nop; ! Let the bits set | ||
69 | jmpl %o7, %g0 ! NOTE: not + 8, see callers in atomic.h | ||
70 | mov %g4, %o7 ! Restore %o7 | ||
71 | |||
72 | .globl ___atomic24_sub | ||
73 | ___atomic24_sub: | ||
74 | rd %psr, %g3 ! Keep the code small, old way was stupid | ||
75 | nop; nop; nop; ! Let the bits set | ||
76 | or %g3, PSR_PIL, %g7 ! Disable interrupts | ||
77 | wr %g7, 0x0, %psr ! Set %psr | ||
78 | nop; nop; nop; ! Let the bits set | ||
79 | #ifdef CONFIG_SMP | ||
80 | 1: ldstub [%g1 + 3], %g7 ! Spin on the byte lock for SMP. | ||
81 | orcc %g7, 0x0, %g0 ! Did we get it? | ||
82 | bne 1b ! Nope... | ||
83 | ld [%g1], %g7 ! Load locked atomic24_t | ||
84 | sra %g7, 8, %g7 ! Get signed 24-bit integer | ||
85 | sub %g7, %g2, %g2 ! Subtract argument | ||
86 | sll %g2, 8, %g7 ! Transpose back to atomic24_t | ||
87 | st %g7, [%g1] ! Clever: This releases the lock as well | ||
88 | #else | ||
89 | ld [%g1], %g7 ! Load locked atomic24_t | ||
90 | sub %g7, %g2, %g2 ! Subtract argument | ||
91 | st %g2, [%g1] ! Store it back | ||
92 | #endif | ||
93 | wr %g3, 0x0, %psr ! Restore original PSR_PIL | ||
94 | nop; nop; nop; ! Let the bits set | ||
95 | jmpl %o7, %g0 ! NOTE: not + 8, see callers in atomic.h | ||
96 | mov %g4, %o7 ! Restore %o7 | ||
97 | |||
98 | .globl __atomic_end | 43 | .globl __atomic_end |
99 | __atomic_end: | 44 | __atomic_end: |
diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c index 1b30bb3bfdb1..f73c2240fe60 100644 --- a/arch/sparc/lib/ksyms.c +++ b/arch/sparc/lib/ksyms.c | |||
@@ -62,8 +62,6 @@ extern void ___rw_read_enter(void); | |||
62 | extern void ___rw_read_try(void); | 62 | extern void ___rw_read_try(void); |
63 | extern void ___rw_read_exit(void); | 63 | extern void ___rw_read_exit(void); |
64 | extern void ___rw_write_enter(void); | 64 | extern void ___rw_write_enter(void); |
65 | extern void ___atomic24_add(void); | ||
66 | extern void ___atomic24_sub(void); | ||
67 | 65 | ||
68 | /* Alias functions whose names begin with "." and export the aliases. | 66 | /* Alias functions whose names begin with "." and export the aliases. |
69 | * The module references will be fixed up by module_frob_arch_sections. | 67 | * The module references will be fixed up by module_frob_arch_sections. |
@@ -97,10 +95,6 @@ EXPORT_SYMBOL(___rw_read_exit); | |||
97 | EXPORT_SYMBOL(___rw_write_enter); | 95 | EXPORT_SYMBOL(___rw_write_enter); |
98 | #endif | 96 | #endif |
99 | 97 | ||
100 | /* Atomic operations. */ | ||
101 | EXPORT_SYMBOL(___atomic24_add); | ||
102 | EXPORT_SYMBOL(___atomic24_sub); | ||
103 | |||
104 | EXPORT_SYMBOL(__ashrdi3); | 98 | EXPORT_SYMBOL(__ashrdi3); |
105 | EXPORT_SYMBOL(__ashldi3); | 99 | EXPORT_SYMBOL(__ashldi3); |
106 | EXPORT_SYMBOL(__lshrdi3); | 100 | EXPORT_SYMBOL(__lshrdi3); |