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

MIPS: Fix build error due to PTR used in more places

Use PTR_WD instead of PTR to avoid clashes with other parts.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

Thomas Bogendoerfer fa62f39d e783362e

+185 -185
+2 -2
arch/mips/include/asm/asm.h
··· 285 285 286 286 #define PTR_SCALESHIFT 2 287 287 288 - #define PTR .word 288 + #define PTR_WD .word 289 289 #define PTRSIZE 4 290 290 #define PTRLOG 2 291 291 #endif ··· 310 310 311 311 #define PTR_SCALESHIFT 3 312 312 313 - #define PTR .dword 313 + #define PTR_WD .dword 314 314 #define PTRSIZE 8 315 315 #define PTRLOG 3 316 316 #endif
+2 -2
arch/mips/include/asm/ftrace.h
··· 32 32 ".previous\n" \ 33 33 \ 34 34 ".section\t__ex_table,\"a\"\n\t" \ 35 - STR(PTR) "\t1b, 3b\n\t" \ 35 + STR(PTR_WD) "\t1b, 3b\n\t" \ 36 36 ".previous\n" \ 37 37 \ 38 38 : [tmp_dst] "=&r" (dst), [tmp_err] "=r" (error)\ ··· 54 54 ".previous\n" \ 55 55 \ 56 56 ".section\t__ex_table,\"a\"\n\t"\ 57 - STR(PTR) "\t1b, 3b\n\t" \ 57 + STR(PTR_WD) "\t1b, 3b\n\t" \ 58 58 ".previous\n" \ 59 59 \ 60 60 : [tmp_err] "=r" (error) \
+2 -2
arch/mips/include/asm/r4kcache.h
··· 119 119 " j 2b \n" \ 120 120 " .previous \n" \ 121 121 " .section __ex_table,\"a\" \n" \ 122 - " "STR(PTR)" 1b, 3b \n" \ 122 + " "STR(PTR_WD)" 1b, 3b \n" \ 123 123 " .previous" \ 124 124 : "+r" (__err) \ 125 125 : "i" (op), "r" (addr), "i" (-EFAULT)); \ ··· 142 142 " j 2b \n" \ 143 143 " .previous \n" \ 144 144 " .section __ex_table,\"a\" \n" \ 145 - " "STR(PTR)" 1b, 3b \n" \ 145 + " "STR(PTR_WD)" 1b, 3b \n" \ 146 146 " .previous" \ 147 147 : "+r" (__err) \ 148 148 : "i" (op), "r" (addr), "i" (-EFAULT)); \
+88 -88
arch/mips/include/asm/unaligned-emul.h
··· 20 20 "j\t3b\n\t" \ 21 21 ".previous\n\t" \ 22 22 ".section\t__ex_table,\"a\"\n\t" \ 23 - STR(PTR)"\t1b, 4b\n\t" \ 24 - STR(PTR)"\t2b, 4b\n\t" \ 23 + STR(PTR_WD)"\t1b, 4b\n\t" \ 24 + STR(PTR_WD)"\t2b, 4b\n\t" \ 25 25 ".previous" \ 26 26 : "=&r" (value), "=r" (res) \ 27 27 : "r" (addr), "i" (-EFAULT)); \ ··· 41 41 "j\t3b\n\t" \ 42 42 ".previous\n\t" \ 43 43 ".section\t__ex_table,\"a\"\n\t" \ 44 - STR(PTR)"\t1b, 4b\n\t" \ 45 - STR(PTR)"\t2b, 4b\n\t" \ 44 + STR(PTR_WD)"\t1b, 4b\n\t" \ 45 + STR(PTR_WD)"\t2b, 4b\n\t" \ 46 46 ".previous" \ 47 47 : "=&r" (value), "=r" (res) \ 48 48 : "r" (addr), "i" (-EFAULT)); \ ··· 74 74 "j\t10b\n\t" \ 75 75 ".previous\n\t" \ 76 76 ".section\t__ex_table,\"a\"\n\t" \ 77 - STR(PTR)"\t1b, 11b\n\t" \ 78 - STR(PTR)"\t2b, 11b\n\t" \ 79 - STR(PTR)"\t3b, 11b\n\t" \ 80 - STR(PTR)"\t4b, 11b\n\t" \ 77 + STR(PTR_WD)"\t1b, 11b\n\t" \ 78 + STR(PTR_WD)"\t2b, 11b\n\t" \ 79 + STR(PTR_WD)"\t3b, 11b\n\t" \ 80 + STR(PTR_WD)"\t4b, 11b\n\t" \ 81 81 ".previous" \ 82 82 : "=&r" (value), "=r" (res) \ 83 83 : "r" (addr), "i" (-EFAULT)); \ ··· 102 102 "j\t3b\n\t" \ 103 103 ".previous\n\t" \ 104 104 ".section\t__ex_table,\"a\"\n\t" \ 105 - STR(PTR)"\t1b, 4b\n\t" \ 106 - STR(PTR)"\t2b, 4b\n\t" \ 105 + STR(PTR_WD)"\t1b, 4b\n\t" \ 106 + STR(PTR_WD)"\t2b, 4b\n\t" \ 107 107 ".previous" \ 108 108 : "=&r" (value), "=r" (res) \ 109 109 : "r" (addr), "i" (-EFAULT)); \ ··· 125 125 "j\t3b\n\t" \ 126 126 ".previous\n\t" \ 127 127 ".section\t__ex_table,\"a\"\n\t" \ 128 - STR(PTR)"\t1b, 4b\n\t" \ 129 - STR(PTR)"\t2b, 4b\n\t" \ 128 + STR(PTR_WD)"\t1b, 4b\n\t" \ 129 + STR(PTR_WD)"\t2b, 4b\n\t" \ 130 130 ".previous" \ 131 131 : "=&r" (value), "=r" (res) \ 132 132 : "r" (addr), "i" (-EFAULT)); \ ··· 145 145 "j\t3b\n\t" \ 146 146 ".previous\n\t" \ 147 147 ".section\t__ex_table,\"a\"\n\t" \ 148 - STR(PTR)"\t1b, 4b\n\t" \ 149 - STR(PTR)"\t2b, 4b\n\t" \ 148 + STR(PTR_WD)"\t1b, 4b\n\t" \ 149 + STR(PTR_WD)"\t2b, 4b\n\t" \ 150 150 ".previous" \ 151 151 : "=&r" (value), "=r" (res) \ 152 152 : "r" (addr), "i" (-EFAULT)); \ ··· 178 178 "j\t10b\n\t" \ 179 179 ".previous\n\t" \ 180 180 ".section\t__ex_table,\"a\"\n\t" \ 181 - STR(PTR)"\t1b, 11b\n\t" \ 182 - STR(PTR)"\t2b, 11b\n\t" \ 183 - STR(PTR)"\t3b, 11b\n\t" \ 184 - STR(PTR)"\t4b, 11b\n\t" \ 181 + STR(PTR_WD)"\t1b, 11b\n\t" \ 182 + STR(PTR_WD)"\t2b, 11b\n\t" \ 183 + STR(PTR_WD)"\t3b, 11b\n\t" \ 184 + STR(PTR_WD)"\t4b, 11b\n\t" \ 185 185 ".previous" \ 186 186 : "=&r" (value), "=r" (res) \ 187 187 : "r" (addr), "i" (-EFAULT)); \ ··· 223 223 "j\t10b\n\t" \ 224 224 ".previous\n\t" \ 225 225 ".section\t__ex_table,\"a\"\n\t" \ 226 - STR(PTR)"\t1b, 11b\n\t" \ 227 - STR(PTR)"\t2b, 11b\n\t" \ 228 - STR(PTR)"\t3b, 11b\n\t" \ 229 - STR(PTR)"\t4b, 11b\n\t" \ 230 - STR(PTR)"\t5b, 11b\n\t" \ 231 - STR(PTR)"\t6b, 11b\n\t" \ 232 - STR(PTR)"\t7b, 11b\n\t" \ 233 - STR(PTR)"\t8b, 11b\n\t" \ 226 + STR(PTR_WD)"\t1b, 11b\n\t" \ 227 + STR(PTR_WD)"\t2b, 11b\n\t" \ 228 + STR(PTR_WD)"\t3b, 11b\n\t" \ 229 + STR(PTR_WD)"\t4b, 11b\n\t" \ 230 + STR(PTR_WD)"\t5b, 11b\n\t" \ 231 + STR(PTR_WD)"\t6b, 11b\n\t" \ 232 + STR(PTR_WD)"\t7b, 11b\n\t" \ 233 + STR(PTR_WD)"\t8b, 11b\n\t" \ 234 234 ".previous" \ 235 235 : "=&r" (value), "=r" (res) \ 236 236 : "r" (addr), "i" (-EFAULT)); \ ··· 255 255 "j\t3b\n\t" \ 256 256 ".previous\n\t" \ 257 257 ".section\t__ex_table,\"a\"\n\t" \ 258 - STR(PTR)"\t1b, 4b\n\t" \ 259 - STR(PTR)"\t2b, 4b\n\t" \ 258 + STR(PTR_WD)"\t1b, 4b\n\t" \ 259 + STR(PTR_WD)"\t2b, 4b\n\t" \ 260 260 ".previous" \ 261 261 : "=r" (res) \ 262 262 : "r" (value), "r" (addr), "i" (-EFAULT));\ ··· 276 276 "j\t3b\n\t" \ 277 277 ".previous\n\t" \ 278 278 ".section\t__ex_table,\"a\"\n\t" \ 279 - STR(PTR)"\t1b, 4b\n\t" \ 280 - STR(PTR)"\t2b, 4b\n\t" \ 279 + STR(PTR_WD)"\t1b, 4b\n\t" \ 280 + STR(PTR_WD)"\t2b, 4b\n\t" \ 281 281 ".previous" \ 282 282 : "=r" (res) \ 283 283 : "r" (value), "r" (addr), "i" (-EFAULT)); \ ··· 296 296 "j\t3b\n\t" \ 297 297 ".previous\n\t" \ 298 298 ".section\t__ex_table,\"a\"\n\t" \ 299 - STR(PTR)"\t1b, 4b\n\t" \ 300 - STR(PTR)"\t2b, 4b\n\t" \ 299 + STR(PTR_WD)"\t1b, 4b\n\t" \ 300 + STR(PTR_WD)"\t2b, 4b\n\t" \ 301 301 ".previous" \ 302 302 : "=r" (res) \ 303 303 : "r" (value), "r" (addr), "i" (-EFAULT)); \ ··· 325 325 "j\t10b\n\t" \ 326 326 ".previous\n\t" \ 327 327 ".section\t__ex_table,\"a\"\n\t" \ 328 - STR(PTR)"\t1b, 11b\n\t" \ 329 - STR(PTR)"\t2b, 11b\n\t" \ 330 - STR(PTR)"\t3b, 11b\n\t" \ 331 - STR(PTR)"\t4b, 11b\n\t" \ 328 + STR(PTR_WD)"\t1b, 11b\n\t" \ 329 + STR(PTR_WD)"\t2b, 11b\n\t" \ 330 + STR(PTR_WD)"\t3b, 11b\n\t" \ 331 + STR(PTR_WD)"\t4b, 11b\n\t" \ 332 332 ".previous" \ 333 333 : "=&r" (res) \ 334 334 : "r" (value), "r" (addr), "i" (-EFAULT) \ ··· 365 365 "j\t10b\n\t" \ 366 366 ".previous\n\t" \ 367 367 ".section\t__ex_table,\"a\"\n\t" \ 368 - STR(PTR)"\t1b, 11b\n\t" \ 369 - STR(PTR)"\t2b, 11b\n\t" \ 370 - STR(PTR)"\t3b, 11b\n\t" \ 371 - STR(PTR)"\t4b, 11b\n\t" \ 372 - STR(PTR)"\t5b, 11b\n\t" \ 373 - STR(PTR)"\t6b, 11b\n\t" \ 374 - STR(PTR)"\t7b, 11b\n\t" \ 375 - STR(PTR)"\t8b, 11b\n\t" \ 368 + STR(PTR_WD)"\t1b, 11b\n\t" \ 369 + STR(PTR_WD)"\t2b, 11b\n\t" \ 370 + STR(PTR_WD)"\t3b, 11b\n\t" \ 371 + STR(PTR_WD)"\t4b, 11b\n\t" \ 372 + STR(PTR_WD)"\t5b, 11b\n\t" \ 373 + STR(PTR_WD)"\t6b, 11b\n\t" \ 374 + STR(PTR_WD)"\t7b, 11b\n\t" \ 375 + STR(PTR_WD)"\t8b, 11b\n\t" \ 376 376 ".previous" \ 377 377 : "=&r" (res) \ 378 378 : "r" (value), "r" (addr), "i" (-EFAULT) \ ··· 398 398 "j\t3b\n\t" \ 399 399 ".previous\n\t" \ 400 400 ".section\t__ex_table,\"a\"\n\t" \ 401 - STR(PTR)"\t1b, 4b\n\t" \ 402 - STR(PTR)"\t2b, 4b\n\t" \ 401 + STR(PTR_WD)"\t1b, 4b\n\t" \ 402 + STR(PTR_WD)"\t2b, 4b\n\t" \ 403 403 ".previous" \ 404 404 : "=&r" (value), "=r" (res) \ 405 405 : "r" (addr), "i" (-EFAULT)); \ ··· 419 419 "j\t3b\n\t" \ 420 420 ".previous\n\t" \ 421 421 ".section\t__ex_table,\"a\"\n\t" \ 422 - STR(PTR)"\t1b, 4b\n\t" \ 423 - STR(PTR)"\t2b, 4b\n\t" \ 422 + STR(PTR_WD)"\t1b, 4b\n\t" \ 423 + STR(PTR_WD)"\t2b, 4b\n\t" \ 424 424 ".previous" \ 425 425 : "=&r" (value), "=r" (res) \ 426 426 : "r" (addr), "i" (-EFAULT)); \ ··· 452 452 "j\t10b\n\t" \ 453 453 ".previous\n\t" \ 454 454 ".section\t__ex_table,\"a\"\n\t" \ 455 - STR(PTR)"\t1b, 11b\n\t" \ 456 - STR(PTR)"\t2b, 11b\n\t" \ 457 - STR(PTR)"\t3b, 11b\n\t" \ 458 - STR(PTR)"\t4b, 11b\n\t" \ 455 + STR(PTR_WD)"\t1b, 11b\n\t" \ 456 + STR(PTR_WD)"\t2b, 11b\n\t" \ 457 + STR(PTR_WD)"\t3b, 11b\n\t" \ 458 + STR(PTR_WD)"\t4b, 11b\n\t" \ 459 459 ".previous" \ 460 460 : "=&r" (value), "=r" (res) \ 461 461 : "r" (addr), "i" (-EFAULT)); \ ··· 481 481 "j\t3b\n\t" \ 482 482 ".previous\n\t" \ 483 483 ".section\t__ex_table,\"a\"\n\t" \ 484 - STR(PTR)"\t1b, 4b\n\t" \ 485 - STR(PTR)"\t2b, 4b\n\t" \ 484 + STR(PTR_WD)"\t1b, 4b\n\t" \ 485 + STR(PTR_WD)"\t2b, 4b\n\t" \ 486 486 ".previous" \ 487 487 : "=&r" (value), "=r" (res) \ 488 488 : "r" (addr), "i" (-EFAULT)); \ ··· 504 504 "j\t3b\n\t" \ 505 505 ".previous\n\t" \ 506 506 ".section\t__ex_table,\"a\"\n\t" \ 507 - STR(PTR)"\t1b, 4b\n\t" \ 508 - STR(PTR)"\t2b, 4b\n\t" \ 507 + STR(PTR_WD)"\t1b, 4b\n\t" \ 508 + STR(PTR_WD)"\t2b, 4b\n\t" \ 509 509 ".previous" \ 510 510 : "=&r" (value), "=r" (res) \ 511 511 : "r" (addr), "i" (-EFAULT)); \ ··· 524 524 "j\t3b\n\t" \ 525 525 ".previous\n\t" \ 526 526 ".section\t__ex_table,\"a\"\n\t" \ 527 - STR(PTR)"\t1b, 4b\n\t" \ 528 - STR(PTR)"\t2b, 4b\n\t" \ 527 + STR(PTR_WD)"\t1b, 4b\n\t" \ 528 + STR(PTR_WD)"\t2b, 4b\n\t" \ 529 529 ".previous" \ 530 530 : "=&r" (value), "=r" (res) \ 531 531 : "r" (addr), "i" (-EFAULT)); \ ··· 557 557 "j\t10b\n\t" \ 558 558 ".previous\n\t" \ 559 559 ".section\t__ex_table,\"a\"\n\t" \ 560 - STR(PTR)"\t1b, 11b\n\t" \ 561 - STR(PTR)"\t2b, 11b\n\t" \ 562 - STR(PTR)"\t3b, 11b\n\t" \ 563 - STR(PTR)"\t4b, 11b\n\t" \ 560 + STR(PTR_WD)"\t1b, 11b\n\t" \ 561 + STR(PTR_WD)"\t2b, 11b\n\t" \ 562 + STR(PTR_WD)"\t3b, 11b\n\t" \ 563 + STR(PTR_WD)"\t4b, 11b\n\t" \ 564 564 ".previous" \ 565 565 : "=&r" (value), "=r" (res) \ 566 566 : "r" (addr), "i" (-EFAULT)); \ ··· 602 602 "j\t10b\n\t" \ 603 603 ".previous\n\t" \ 604 604 ".section\t__ex_table,\"a\"\n\t" \ 605 - STR(PTR)"\t1b, 11b\n\t" \ 606 - STR(PTR)"\t2b, 11b\n\t" \ 607 - STR(PTR)"\t3b, 11b\n\t" \ 608 - STR(PTR)"\t4b, 11b\n\t" \ 609 - STR(PTR)"\t5b, 11b\n\t" \ 610 - STR(PTR)"\t6b, 11b\n\t" \ 611 - STR(PTR)"\t7b, 11b\n\t" \ 612 - STR(PTR)"\t8b, 11b\n\t" \ 605 + STR(PTR_WD)"\t1b, 11b\n\t" \ 606 + STR(PTR_WD)"\t2b, 11b\n\t" \ 607 + STR(PTR_WD)"\t3b, 11b\n\t" \ 608 + STR(PTR_WD)"\t4b, 11b\n\t" \ 609 + STR(PTR_WD)"\t5b, 11b\n\t" \ 610 + STR(PTR_WD)"\t6b, 11b\n\t" \ 611 + STR(PTR_WD)"\t7b, 11b\n\t" \ 612 + STR(PTR_WD)"\t8b, 11b\n\t" \ 613 613 ".previous" \ 614 614 : "=&r" (value), "=r" (res) \ 615 615 : "r" (addr), "i" (-EFAULT)); \ ··· 632 632 "j\t3b\n\t" \ 633 633 ".previous\n\t" \ 634 634 ".section\t__ex_table,\"a\"\n\t" \ 635 - STR(PTR)"\t1b, 4b\n\t" \ 636 - STR(PTR)"\t2b, 4b\n\t" \ 635 + STR(PTR_WD)"\t1b, 4b\n\t" \ 636 + STR(PTR_WD)"\t2b, 4b\n\t" \ 637 637 ".previous" \ 638 638 : "=r" (res) \ 639 639 : "r" (value), "r" (addr), "i" (-EFAULT));\ ··· 653 653 "j\t3b\n\t" \ 654 654 ".previous\n\t" \ 655 655 ".section\t__ex_table,\"a\"\n\t" \ 656 - STR(PTR)"\t1b, 4b\n\t" \ 657 - STR(PTR)"\t2b, 4b\n\t" \ 656 + STR(PTR_WD)"\t1b, 4b\n\t" \ 657 + STR(PTR_WD)"\t2b, 4b\n\t" \ 658 658 ".previous" \ 659 659 : "=r" (res) \ 660 660 : "r" (value), "r" (addr), "i" (-EFAULT)); \ ··· 673 673 "j\t3b\n\t" \ 674 674 ".previous\n\t" \ 675 675 ".section\t__ex_table,\"a\"\n\t" \ 676 - STR(PTR)"\t1b, 4b\n\t" \ 677 - STR(PTR)"\t2b, 4b\n\t" \ 676 + STR(PTR_WD)"\t1b, 4b\n\t" \ 677 + STR(PTR_WD)"\t2b, 4b\n\t" \ 678 678 ".previous" \ 679 679 : "=r" (res) \ 680 680 : "r" (value), "r" (addr), "i" (-EFAULT)); \ ··· 703 703 "j\t10b\n\t" \ 704 704 ".previous\n\t" \ 705 705 ".section\t__ex_table,\"a\"\n\t" \ 706 - STR(PTR)"\t1b, 11b\n\t" \ 707 - STR(PTR)"\t2b, 11b\n\t" \ 708 - STR(PTR)"\t3b, 11b\n\t" \ 709 - STR(PTR)"\t4b, 11b\n\t" \ 706 + STR(PTR_WD)"\t1b, 11b\n\t" \ 707 + STR(PTR_WD)"\t2b, 11b\n\t" \ 708 + STR(PTR_WD)"\t3b, 11b\n\t" \ 709 + STR(PTR_WD)"\t4b, 11b\n\t" \ 710 710 ".previous" \ 711 711 : "=&r" (res) \ 712 712 : "r" (value), "r" (addr), "i" (-EFAULT) \ ··· 743 743 "j\t10b\n\t" \ 744 744 ".previous\n\t" \ 745 745 ".section\t__ex_table,\"a\"\n\t" \ 746 - STR(PTR)"\t1b, 11b\n\t" \ 747 - STR(PTR)"\t2b, 11b\n\t" \ 748 - STR(PTR)"\t3b, 11b\n\t" \ 749 - STR(PTR)"\t4b, 11b\n\t" \ 750 - STR(PTR)"\t5b, 11b\n\t" \ 751 - STR(PTR)"\t6b, 11b\n\t" \ 752 - STR(PTR)"\t7b, 11b\n\t" \ 753 - STR(PTR)"\t8b, 11b\n\t" \ 746 + STR(PTR_WD)"\t1b, 11b\n\t" \ 747 + STR(PTR_WD)"\t2b, 11b\n\t" \ 748 + STR(PTR_WD)"\t3b, 11b\n\t" \ 749 + STR(PTR_WD)"\t4b, 11b\n\t" \ 750 + STR(PTR_WD)"\t5b, 11b\n\t" \ 751 + STR(PTR_WD)"\t6b, 11b\n\t" \ 752 + STR(PTR_WD)"\t7b, 11b\n\t" \ 753 + STR(PTR_WD)"\t8b, 11b\n\t" \ 754 754 ".previous" \ 755 755 : "=&r" (res) \ 756 756 : "r" (value), "r" (addr), "i" (-EFAULT) \
+52 -52
arch/mips/kernel/mips-r2-to-r6-emul.c
··· 1258 1258 " j 10b\n" 1259 1259 " .previous\n" 1260 1260 " .section __ex_table,\"a\"\n" 1261 - STR(PTR) " 1b,8b\n" 1262 - STR(PTR) " 2b,8b\n" 1263 - STR(PTR) " 3b,8b\n" 1264 - STR(PTR) " 4b,8b\n" 1261 + STR(PTR_WD) " 1b,8b\n" 1262 + STR(PTR_WD) " 2b,8b\n" 1263 + STR(PTR_WD) " 3b,8b\n" 1264 + STR(PTR_WD) " 4b,8b\n" 1265 1265 " .previous\n" 1266 1266 " .set pop\n" 1267 1267 : "+&r"(rt), "=&r"(rs), ··· 1333 1333 " j 10b\n" 1334 1334 " .previous\n" 1335 1335 " .section __ex_table,\"a\"\n" 1336 - STR(PTR) " 1b,8b\n" 1337 - STR(PTR) " 2b,8b\n" 1338 - STR(PTR) " 3b,8b\n" 1339 - STR(PTR) " 4b,8b\n" 1336 + STR(PTR_WD) " 1b,8b\n" 1337 + STR(PTR_WD) " 2b,8b\n" 1338 + STR(PTR_WD) " 3b,8b\n" 1339 + STR(PTR_WD) " 4b,8b\n" 1340 1340 " .previous\n" 1341 1341 " .set pop\n" 1342 1342 : "+&r"(rt), "=&r"(rs), ··· 1404 1404 " j 9b\n" 1405 1405 " .previous\n" 1406 1406 " .section __ex_table,\"a\"\n" 1407 - STR(PTR) " 1b,8b\n" 1408 - STR(PTR) " 2b,8b\n" 1409 - STR(PTR) " 3b,8b\n" 1410 - STR(PTR) " 4b,8b\n" 1407 + STR(PTR_WD) " 1b,8b\n" 1408 + STR(PTR_WD) " 2b,8b\n" 1409 + STR(PTR_WD) " 3b,8b\n" 1410 + STR(PTR_WD) " 4b,8b\n" 1411 1411 " .previous\n" 1412 1412 " .set pop\n" 1413 1413 : "+&r"(rt), "=&r"(rs), ··· 1474 1474 " j 9b\n" 1475 1475 " .previous\n" 1476 1476 " .section __ex_table,\"a\"\n" 1477 - STR(PTR) " 1b,8b\n" 1478 - STR(PTR) " 2b,8b\n" 1479 - STR(PTR) " 3b,8b\n" 1480 - STR(PTR) " 4b,8b\n" 1477 + STR(PTR_WD) " 1b,8b\n" 1478 + STR(PTR_WD) " 2b,8b\n" 1479 + STR(PTR_WD) " 3b,8b\n" 1480 + STR(PTR_WD) " 4b,8b\n" 1481 1481 " .previous\n" 1482 1482 " .set pop\n" 1483 1483 : "+&r"(rt), "=&r"(rs), ··· 1589 1589 " j 9b\n" 1590 1590 " .previous\n" 1591 1591 " .section __ex_table,\"a\"\n" 1592 - STR(PTR) " 1b,8b\n" 1593 - STR(PTR) " 2b,8b\n" 1594 - STR(PTR) " 3b,8b\n" 1595 - STR(PTR) " 4b,8b\n" 1596 - STR(PTR) " 5b,8b\n" 1597 - STR(PTR) " 6b,8b\n" 1598 - STR(PTR) " 7b,8b\n" 1599 - STR(PTR) " 0b,8b\n" 1592 + STR(PTR_WD) " 1b,8b\n" 1593 + STR(PTR_WD) " 2b,8b\n" 1594 + STR(PTR_WD) " 3b,8b\n" 1595 + STR(PTR_WD) " 4b,8b\n" 1596 + STR(PTR_WD) " 5b,8b\n" 1597 + STR(PTR_WD) " 6b,8b\n" 1598 + STR(PTR_WD) " 7b,8b\n" 1599 + STR(PTR_WD) " 0b,8b\n" 1600 1600 " .previous\n" 1601 1601 " .set pop\n" 1602 1602 : "+&r"(rt), "=&r"(rs), ··· 1708 1708 " j 9b\n" 1709 1709 " .previous\n" 1710 1710 " .section __ex_table,\"a\"\n" 1711 - STR(PTR) " 1b,8b\n" 1712 - STR(PTR) " 2b,8b\n" 1713 - STR(PTR) " 3b,8b\n" 1714 - STR(PTR) " 4b,8b\n" 1715 - STR(PTR) " 5b,8b\n" 1716 - STR(PTR) " 6b,8b\n" 1717 - STR(PTR) " 7b,8b\n" 1718 - STR(PTR) " 0b,8b\n" 1711 + STR(PTR_WD) " 1b,8b\n" 1712 + STR(PTR_WD) " 2b,8b\n" 1713 + STR(PTR_WD) " 3b,8b\n" 1714 + STR(PTR_WD) " 4b,8b\n" 1715 + STR(PTR_WD) " 5b,8b\n" 1716 + STR(PTR_WD) " 6b,8b\n" 1717 + STR(PTR_WD) " 7b,8b\n" 1718 + STR(PTR_WD) " 0b,8b\n" 1719 1719 " .previous\n" 1720 1720 " .set pop\n" 1721 1721 : "+&r"(rt), "=&r"(rs), ··· 1827 1827 " j 9b\n" 1828 1828 " .previous\n" 1829 1829 " .section __ex_table,\"a\"\n" 1830 - STR(PTR) " 1b,8b\n" 1831 - STR(PTR) " 2b,8b\n" 1832 - STR(PTR) " 3b,8b\n" 1833 - STR(PTR) " 4b,8b\n" 1834 - STR(PTR) " 5b,8b\n" 1835 - STR(PTR) " 6b,8b\n" 1836 - STR(PTR) " 7b,8b\n" 1837 - STR(PTR) " 0b,8b\n" 1830 + STR(PTR_WD) " 1b,8b\n" 1831 + STR(PTR_WD) " 2b,8b\n" 1832 + STR(PTR_WD) " 3b,8b\n" 1833 + STR(PTR_WD) " 4b,8b\n" 1834 + STR(PTR_WD) " 5b,8b\n" 1835 + STR(PTR_WD) " 6b,8b\n" 1836 + STR(PTR_WD) " 7b,8b\n" 1837 + STR(PTR_WD) " 0b,8b\n" 1838 1838 " .previous\n" 1839 1839 " .set pop\n" 1840 1840 : "+&r"(rt), "=&r"(rs), ··· 1945 1945 " j 9b\n" 1946 1946 " .previous\n" 1947 1947 " .section __ex_table,\"a\"\n" 1948 - STR(PTR) " 1b,8b\n" 1949 - STR(PTR) " 2b,8b\n" 1950 - STR(PTR) " 3b,8b\n" 1951 - STR(PTR) " 4b,8b\n" 1952 - STR(PTR) " 5b,8b\n" 1953 - STR(PTR) " 6b,8b\n" 1954 - STR(PTR) " 7b,8b\n" 1955 - STR(PTR) " 0b,8b\n" 1948 + STR(PTR_WD) " 1b,8b\n" 1949 + STR(PTR_WD) " 2b,8b\n" 1950 + STR(PTR_WD) " 3b,8b\n" 1951 + STR(PTR_WD) " 4b,8b\n" 1952 + STR(PTR_WD) " 5b,8b\n" 1953 + STR(PTR_WD) " 6b,8b\n" 1954 + STR(PTR_WD) " 7b,8b\n" 1955 + STR(PTR_WD) " 0b,8b\n" 1956 1956 " .previous\n" 1957 1957 " .set pop\n" 1958 1958 : "+&r"(rt), "=&r"(rs), ··· 2007 2007 "j 2b\n" 2008 2008 ".previous\n" 2009 2009 ".section __ex_table,\"a\"\n" 2010 - STR(PTR) " 1b,3b\n" 2010 + STR(PTR_WD) " 1b,3b\n" 2011 2011 ".previous\n" 2012 2012 : "=&r"(res), "+&r"(err) 2013 2013 : "r"(vaddr), "i"(SIGSEGV) ··· 2065 2065 "j 2b\n" 2066 2066 ".previous\n" 2067 2067 ".section __ex_table,\"a\"\n" 2068 - STR(PTR) " 1b,3b\n" 2068 + STR(PTR_WD) " 1b,3b\n" 2069 2069 ".previous\n" 2070 2070 : "+&r"(res), "+&r"(err) 2071 2071 : "r"(vaddr), "i"(SIGSEGV)); ··· 2126 2126 "j 2b\n" 2127 2127 ".previous\n" 2128 2128 ".section __ex_table,\"a\"\n" 2129 - STR(PTR) " 1b,3b\n" 2129 + STR(PTR_WD) " 1b,3b\n" 2130 2130 ".previous\n" 2131 2131 : "=&r"(res), "+&r"(err) 2132 2132 : "r"(vaddr), "i"(SIGSEGV) ··· 2189 2189 "j 2b\n" 2190 2190 ".previous\n" 2191 2191 ".section __ex_table,\"a\"\n" 2192 - STR(PTR) " 1b,3b\n" 2192 + STR(PTR_WD) " 1b,3b\n" 2193 2193 ".previous\n" 2194 2194 : "+&r"(res), "+&r"(err) 2195 2195 : "r"(vaddr), "i"(SIGSEGV));
+3 -3
arch/mips/kernel/r2300_fpu.S
··· 23 23 #define EX(a,b) \ 24 24 9: a,##b; \ 25 25 .section __ex_table,"a"; \ 26 - PTR 9b,fault; \ 26 + PTR_WD 9b,fault; \ 27 27 .previous 28 28 29 29 #define EX2(a,b) \ 30 30 9: a,##b; \ 31 31 .section __ex_table,"a"; \ 32 - PTR 9b,fault; \ 33 - PTR 9b+4,fault; \ 32 + PTR_WD 9b,fault; \ 33 + PTR_WD 9b+4,fault; \ 34 34 .previous 35 35 36 36 .set mips1
+1 -1
arch/mips/kernel/r4k_fpu.S
··· 31 31 .ex\@: \insn \reg, \src 32 32 .set pop 33 33 .section __ex_table,"a" 34 - PTR .ex\@, fault 34 + PTR_WD .ex\@, fault 35 35 .previous 36 36 .endm 37 37
+11 -11
arch/mips/kernel/relocate_kernel.S
··· 147 147 148 148 kexec_args: 149 149 EXPORT(kexec_args) 150 - arg0: PTR 0x0 151 - arg1: PTR 0x0 152 - arg2: PTR 0x0 153 - arg3: PTR 0x0 150 + arg0: PTR_WD 0x0 151 + arg1: PTR_WD 0x0 152 + arg2: PTR_WD 0x0 153 + arg3: PTR_WD 0x0 154 154 .size kexec_args,PTRSIZE*4 155 155 156 156 #ifdef CONFIG_SMP ··· 161 161 */ 162 162 secondary_kexec_args: 163 163 EXPORT(secondary_kexec_args) 164 - s_arg0: PTR 0x0 165 - s_arg1: PTR 0x0 166 - s_arg2: PTR 0x0 167 - s_arg3: PTR 0x0 164 + s_arg0: PTR_WD 0x0 165 + s_arg1: PTR_WD 0x0 166 + s_arg2: PTR_WD 0x0 167 + s_arg3: PTR_WD 0x0 168 168 .size secondary_kexec_args,PTRSIZE*4 169 169 kexec_flag: 170 170 LONG 0x1 ··· 173 173 174 174 kexec_start_address: 175 175 EXPORT(kexec_start_address) 176 - PTR 0x0 176 + PTR_WD 0x0 177 177 .size kexec_start_address, PTRSIZE 178 178 179 179 kexec_indirection_page: 180 180 EXPORT(kexec_indirection_page) 181 - PTR 0 181 + PTR_WD 0 182 182 .size kexec_indirection_page, PTRSIZE 183 183 184 184 relocate_new_kernel_end: 185 185 186 186 relocate_new_kernel_size: 187 187 EXPORT(relocate_new_kernel_size) 188 - PTR relocate_new_kernel_end - relocate_new_kernel 188 + PTR_WD relocate_new_kernel_end - relocate_new_kernel 189 189 .size relocate_new_kernel_size, PTRSIZE
+5 -5
arch/mips/kernel/scall32-o32.S
··· 72 72 .set pop 73 73 74 74 .section __ex_table,"a" 75 - PTR load_a4, bad_stack_a4 76 - PTR load_a5, bad_stack_a5 77 - PTR load_a6, bad_stack_a6 78 - PTR load_a7, bad_stack_a7 75 + PTR_WD load_a4, bad_stack_a4 76 + PTR_WD load_a5, bad_stack_a5 77 + PTR_WD load_a6, bad_stack_a6 78 + PTR_WD load_a7, bad_stack_a7 79 79 .previous 80 80 81 81 lw t0, TI_FLAGS($28) # syscall tracing enabled? ··· 216 216 #endif /* CONFIG_MIPS_MT_FPAFF */ 217 217 218 218 #define __SYSCALL_WITH_COMPAT(nr, native, compat) __SYSCALL(nr, native) 219 - #define __SYSCALL(nr, entry) PTR entry 219 + #define __SYSCALL(nr, entry) PTR_WD entry 220 220 .align 2 221 221 .type sys_call_table, @object 222 222 EXPORT(sys_call_table)
+1 -1
arch/mips/kernel/scall64-n32.S
··· 101 101 102 102 END(handle_sysn32) 103 103 104 - #define __SYSCALL(nr, entry) PTR entry 104 + #define __SYSCALL(nr, entry) PTR_WD entry 105 105 .type sysn32_call_table, @object 106 106 EXPORT(sysn32_call_table) 107 107 #include <asm/syscall_table_n32.h>
+1 -1
arch/mips/kernel/scall64-n64.S
··· 109 109 j n64_syscall_exit 110 110 END(handle_sys64) 111 111 112 - #define __SYSCALL(nr, entry) PTR entry 112 + #define __SYSCALL(nr, entry) PTR_WD entry 113 113 .align 3 114 114 .type sys_call_table, @object 115 115 EXPORT(sys_call_table)
+5 -5
arch/mips/kernel/scall64-o32.S
··· 73 73 loads_done: 74 74 75 75 .section __ex_table,"a" 76 - PTR load_a4, bad_stack_a4 77 - PTR load_a5, bad_stack_a5 78 - PTR load_a6, bad_stack_a6 79 - PTR load_a7, bad_stack_a7 76 + PTR_WD load_a4, bad_stack_a4 77 + PTR_WD load_a5, bad_stack_a5 78 + PTR_WD load_a6, bad_stack_a6 79 + PTR_WD load_a7, bad_stack_a7 80 80 .previous 81 81 82 82 li t1, _TIF_WORK_SYSCALL_ENTRY ··· 214 214 END(sys32_syscall) 215 215 216 216 #define __SYSCALL_WITH_COMPAT(nr, native, compat) __SYSCALL(nr, compat) 217 - #define __SYSCALL(nr, entry) PTR entry 217 + #define __SYSCALL(nr, entry) PTR_WD entry 218 218 .align 3 219 219 .type sys32_call_table,@object 220 220 EXPORT(sys32_call_table)
+4 -4
arch/mips/kernel/syscall.c
··· 122 122 " j 3b \n" 123 123 " .previous \n" 124 124 " .section __ex_table,\"a\" \n" 125 - " "STR(PTR)" 1b, 4b \n" 126 - " "STR(PTR)" 2b, 4b \n" 125 + " "STR(PTR_WD)" 1b, 4b \n" 126 + " "STR(PTR_WD)" 2b, 4b \n" 127 127 " .previous \n" 128 128 " .set pop \n" 129 129 : [old] "=&r" (old), ··· 152 152 " j 3b \n" 153 153 " .previous \n" 154 154 " .section __ex_table,\"a\" \n" 155 - " "STR(PTR)" 1b, 5b \n" 156 - " "STR(PTR)" 2b, 5b \n" 155 + " "STR(PTR_WD)" 1b, 5b \n" 156 + " "STR(PTR_WD)" 2b, 5b \n" 157 157 " .previous \n" 158 158 " .set pop \n" 159 159 : [old] "=&r" (old),
+2 -2
arch/mips/lib/csum_partial.S
··· 347 347 .if \mode == LEGACY_MODE; \ 348 348 9: insn reg, addr; \ 349 349 .section __ex_table,"a"; \ 350 - PTR 9b, .L_exc; \ 350 + PTR_WD 9b, .L_exc; \ 351 351 .previous; \ 352 352 /* This is enabled in EVA mode */ \ 353 353 .else; \ ··· 356 356 ((\to == USEROP) && (type == ST_INSN)); \ 357 357 9: __BUILD_EVA_INSN(insn##e, reg, addr); \ 358 358 .section __ex_table,"a"; \ 359 - PTR 9b, .L_exc; \ 359 + PTR_WD 9b, .L_exc; \ 360 360 .previous; \ 361 361 .else; \ 362 362 /* EVA without exception */ \
+2 -2
arch/mips/lib/memcpy.S
··· 116 116 .if \mode == LEGACY_MODE; \ 117 117 9: insn reg, addr; \ 118 118 .section __ex_table,"a"; \ 119 - PTR 9b, handler; \ 119 + PTR_WD 9b, handler; \ 120 120 .previous; \ 121 121 /* This is assembled in EVA mode */ \ 122 122 .else; \ ··· 125 125 ((\to == USEROP) && (type == ST_INSN)); \ 126 126 9: __BUILD_EVA_INSN(insn##e, reg, addr); \ 127 127 .section __ex_table,"a"; \ 128 - PTR 9b, handler; \ 128 + PTR_WD 9b, handler; \ 129 129 .previous; \ 130 130 .else; \ 131 131 /* \
+1 -1
arch/mips/lib/memset.S
··· 52 52 9: ___BUILD_EVA_INSN(insn, reg, addr); \ 53 53 .endif; \ 54 54 .section __ex_table,"a"; \ 55 - PTR 9b, handler; \ 55 + PTR_WD 9b, handler; \ 56 56 .previous 57 57 58 58 .macro f_fill64 dst, offset, val, fixup, mode
+2 -2
arch/mips/lib/strncpy_user.S
··· 15 15 #define EX(insn,reg,addr,handler) \ 16 16 9: insn reg, addr; \ 17 17 .section __ex_table,"a"; \ 18 - PTR 9b, handler; \ 18 + PTR_WD 9b, handler; \ 19 19 .previous 20 20 21 21 /* ··· 59 59 jr ra 60 60 61 61 .section __ex_table,"a" 62 - PTR 1b, .Lfault 62 + PTR_WD 1b, .Lfault 63 63 .previous 64 64 65 65 EXPORT_SYMBOL(__strncpy_from_user_asm)
+1 -1
arch/mips/lib/strnlen_user.S
··· 14 14 #define EX(insn,reg,addr,handler) \ 15 15 9: insn reg, addr; \ 16 16 .section __ex_table,"a"; \ 17 - PTR 9b, handler; \ 17 + PTR_WD 9b, handler; \ 18 18 .previous 19 19 20 20 /*