Skip to content

Commit 3ce8f4a

Browse files
committed
ARM: omap1: avoid symbol clashes in fiq handler
The ams-delta-fiq-handler.S file has a number of symbols with fairly generic names, including one named 'exit' that causes a compiler warning in some configuration options: vmlinux.o: error: exit() function name creates ambiguity with -ffunction-sections Change all these symbols to use a .L prefix to make them local to the fiq handler. Reviewed-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> Link: https://lore.kernel.org/r/20251204095355.1032786-1-arnd@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent ad2478e commit 3ce8f4a

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

arch/arm/mach-omap1/ams-delta-fiq-handler.S

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -97,41 +97,41 @@ ENTRY(qwerty_fiqin_start)
9797

9898
ldr r13, [r12, #IRQ_ITR_REG_OFFSET] @ fetch interrupts status
9999
bics r13, r13, r11 @ clear masked - any left?
100-
beq exit @ none - spurious FIQ? exit
100+
beq .Lexit @ none - spurious FIQ? exit
101101

102102
ldr r10, [r12, #IRQ_SIR_FIQ_REG_OFFSET] @ get requested interrupt number
103103

104104
mov r8, #2 @ reset FIQ agreement
105105
str r8, [r12, #IRQ_CONTROL_REG_OFFSET]
106106

107107
cmp r10, #(INT_GPIO_BANK1 - NR_IRQS_LEGACY) @ is it GPIO interrupt?
108-
beq gpio @ yes - process it
108+
beq .Lgpio @ yes - process it
109109

110110
mov r8, #1
111111
orr r8, r11, r8, lsl r10 @ mask spurious interrupt
112112
str r8, [r12, #IRQ_MIR_REG_OFFSET]
113-
exit:
113+
.Lexit:
114114
subs pc, lr, #4 @ return from FIQ
115115
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
116116

117117

118118
@@@@@@@@@@@@@@@@@@@@@@@@@@@
119-
gpio: @ GPIO bank interrupt handler
119+
.Lgpio: @ GPIO bank interrupt handler
120120
ldr r12, omap1510_gpio_base @ set base pointer to GPIO bank
121121

122122
ldr r11, [r12, #OMAP1510_GPIO_INT_MASK] @ fetch GPIO interrupts mask
123-
restart:
123+
.Lrestart:
124124
ldr r13, [r12, #OMAP1510_GPIO_INT_STATUS] @ fetch status bits
125125
bics r13, r13, r11 @ clear masked - any left?
126-
beq exit @ no - spurious interrupt? exit
126+
beq .Lexit @ no - spurious interrupt? exit
127127

128128
orr r11, r11, r13 @ mask all requested interrupts
129129
str r11, [r12, #OMAP1510_GPIO_INT_MASK]
130130

131131
str r13, [r12, #OMAP1510_GPIO_INT_STATUS] @ ack all requested interrupts
132132

133133
ands r10, r13, #KEYBRD_CLK_MASK @ extract keyboard status - set?
134-
beq hksw @ no - try next source
134+
beq .Lhksw @ no - try next source
135135

136136

137137
@@@@@@@@@@@@@@@@@@@@@@
@@ -145,10 +145,10 @@ restart:
145145

146146
ldr r10, [r9, #BUF_STATE] @ fetch kbd interface state
147147
cmp r10, #0 @ are we expecting start bit?
148-
bne data @ no - go to data processing
148+
bne .Ldata @ no - go to data processing
149149

150150
ands r8, r8, #KEYBRD_DATA_MASK @ check start bit - detected?
151-
beq hksw @ no - try next source
151+
beq .Lhksw @ no - try next source
152152

153153
@ r8 contains KEYBRD_DATA_MASK, use it
154154
str r8, [r9, #BUF_STATE] @ enter data processing state
@@ -162,9 +162,9 @@ restart:
162162
mvn r11, #KEYBRD_CLK_MASK @ prepare all except kbd mask
163163
str r11, [r12, #OMAP1510_GPIO_INT_MASK] @ store into the mask register
164164

165-
b restart @ restart
165+
b .Lrestart @ restart
166166

167-
data: ldr r10, [r9, #BUF_MASK] @ fetch current input bit mask
167+
.Ldata: ldr r10, [r9, #BUF_MASK] @ fetch current input bit mask
168168

169169
@ r8 still contains GPIO input bits
170170
ands r8, r8, #KEYBRD_DATA_MASK @ is keyboard data line low?
@@ -175,7 +175,7 @@ data: ldr r10, [r9, #BUF_MASK] @ fetch current input bit mask
175175
mov r10, r10, lsl #1 @ shift mask left
176176
bics r10, r10, #0x800 @ have we got all the bits?
177177
strne r10, [r9, #BUF_MASK] @ not yet - store the mask
178-
bne restart @ and restart
178+
bne .Lrestart @ and restart
179179

180180
@ r10 already contains 0, reuse it
181181
str r10, [r9, #BUF_STATE] @ reset state to start
@@ -189,7 +189,7 @@ data: ldr r10, [r9, #BUF_MASK] @ fetch current input bit mask
189189
ldr r10, [r9, #BUF_KEYS_CNT] @ get saved keystrokes count
190190
ldr r8, [r9, #BUF_BUF_LEN] @ get buffer size
191191
cmp r10, r8 @ is buffer full?
192-
beq hksw @ yes - key lost, next source
192+
beq .Lhksw @ yes - key lost, next source
193193

194194
add r10, r10, #1 @ incremet keystrokes counter
195195
str r10, [r9, #BUF_KEYS_CNT]
@@ -213,9 +213,9 @@ data: ldr r10, [r9, #BUF_MASK] @ fetch current input bit mask
213213
@@@@@@@@@@@@@@@@@@@@@@@@
214214

215215

216-
hksw: @Is hook switch interrupt requested?
216+
.Lhksw: @Is hook switch interrupt requested?
217217
tst r13, #HOOK_SWITCH_MASK @ is hook switch status bit set?
218-
beq mdm @ no - try next source
218+
beq .Lmdm @ no - try next source
219219

220220

221221
@@@@@@@@@@@@@@@@@@@@@@@@
@@ -230,9 +230,9 @@ hksw: @Is hook switch interrupt requested?
230230
@@@@@@@@@@@@@@@@@@@@@@@@
231231

232232

233-
mdm: @Is it a modem interrupt?
233+
.Lmdm: @Is it a modem interrupt?
234234
tst r13, #MODEM_IRQ_MASK @ is modem status bit set?
235-
beq irq @ no - check for next interrupt
235+
beq .Lirq @ no - check for next interrupt
236236

237237

238238
@@@@@@@@@@@@@@@@@@@@@@@@
@@ -245,13 +245,13 @@ mdm: @Is it a modem interrupt?
245245
@@@@@@@@@@@@@@@@@@@@@@@@
246246

247247

248-
irq: @ Place deferred_fiq interrupt request
248+
.Lirq: @ Place deferred_fiq interrupt request
249249
ldr r12, deferred_fiq_ih_base @ set pointer to IRQ handler
250250
mov r10, #DEFERRED_FIQ_MASK @ set deferred_fiq bit
251251
str r10, [r12, #IRQ_ISR_REG_OFFSET] @ place it in the ISR register
252252

253253
ldr r12, omap1510_gpio_base @ set pointer back to GPIO bank
254-
b restart @ check for next GPIO interrupt
254+
b .Lrestart @ check for next GPIO interrupt
255255
@@@@@@@@@@@@@@@@@@@@@@@@@@@
256256

257257

0 commit comments

Comments
 (0)