Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

parisc: add braces around arguments in assembler macros

Add braces around the macro arguments, else for example
"shl %r1, 5-3, %r2" would not expand to what you would assume.

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>

authored by

Helge Deller and committed by
Kyle McMartin
2cfeb9a6 7f384ce7

+8 -8
+5 -5
arch/parisc/include/asm/assembly.h
··· 129 129 130 130 /* Shift Left - note the r and t can NOT be the same! */ 131 131 .macro shl r, sa, t 132 - dep,z \r, 31-\sa, 32-\sa, \t 132 + dep,z \r, 31-(\sa), 32-(\sa), \t 133 133 .endm 134 134 135 135 /* The PA 2.0 shift left */ 136 136 .macro shlw r, sa, t 137 - depw,z \r, 31-\sa, 32-\sa, \t 137 + depw,z \r, 31-(\sa), 32-(\sa), \t 138 138 .endm 139 139 140 140 /* And the PA 2.0W shift left */ 141 141 .macro shld r, sa, t 142 - depd,z \r, 63-\sa, 64-\sa, \t 142 + depd,z \r, 63-(\sa), 64-(\sa), \t 143 143 .endm 144 144 145 145 /* Shift Right - note the r and t can NOT be the same! */ 146 146 .macro shr r, sa, t 147 - extru \r, 31-\sa, 32-\sa, \t 147 + extru \r, 31-(\sa), 32-(\sa), \t 148 148 .endm 149 149 150 150 /* pa20w version of shift right */ 151 151 .macro shrd r, sa, t 152 - extrd,u \r, 63-\sa, 64-\sa, \t 152 + extrd,u \r, 63-(\sa), 64-(\sa), \t 153 153 .endm 154 154 155 155 /* load 32-bit 'value' into 'reg' compensating for the ldil
+3 -3
arch/parisc/kernel/entry.S
··· 368 368 * abstractions for the macros */ 369 369 .macro EXTR reg1,start,length,reg2 370 370 #ifdef CONFIG_64BIT 371 - extrd,u \reg1,32+\start,\length,\reg2 371 + extrd,u \reg1,32+(\start),\length,\reg2 372 372 #else 373 373 extrw,u \reg1,\start,\length,\reg2 374 374 #endif ··· 376 376 377 377 .macro DEP reg1,start,length,reg2 378 378 #ifdef CONFIG_64BIT 379 - depd \reg1,32+\start,\length,\reg2 379 + depd \reg1,32+(\start),\length,\reg2 380 380 #else 381 381 depw \reg1,\start,\length,\reg2 382 382 #endif ··· 384 384 385 385 .macro DEPI val,start,length,reg 386 386 #ifdef CONFIG_64BIT 387 - depdi \val,32+\start,\length,\reg 387 + depdi \val,32+(\start),\length,\reg 388 388 #else 389 389 depwi \val,\start,\length,\reg 390 390 #endif