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

parisc: Remove unnecessary macros from entry.S

The EXTR, DEP and DEPI macros are unnecessary. There are PA 1.X
pneumonics available with the same functionality, and the DEP and DEPI
macros conflict with assembler pneumonics.

Tested on a variety of 32 and 64-bit systems.

Signed-off-by: John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

authored by

John David Anglin and committed by
Kyle McMartin 9b437bca f4c0346c

+7 -33
+7 -33
arch/parisc/kernel/entry.S
··· 364 364 .align 32 365 365 .endm 366 366 367 - /* The following are simple 32 vs 64 bit instruction 368 - * abstractions for the macros */ 369 - .macro EXTR reg1,start,length,reg2 370 - #ifdef CONFIG_64BIT 371 - extrd,u \reg1,32+(\start),\length,\reg2 372 - #else 373 - extrw,u \reg1,\start,\length,\reg2 374 - #endif 375 - .endm 376 - 377 - .macro DEP reg1,start,length,reg2 378 - #ifdef CONFIG_64BIT 379 - depd \reg1,32+(\start),\length,\reg2 380 - #else 381 - depw \reg1,\start,\length,\reg2 382 - #endif 383 - .endm 384 - 385 - .macro DEPI val,start,length,reg 386 - #ifdef CONFIG_64BIT 387 - depdi \val,32+(\start),\length,\reg 388 - #else 389 - depwi \val,\start,\length,\reg 390 - #endif 391 - .endm 392 - 393 367 /* In LP64, the space contains part of the upper 32 bits of the 394 368 * fault. We have to extract this and place it in the va, 395 369 * zeroing the corresponding bits in the space register */ ··· 416 442 */ 417 443 .macro L2_ptep pmd,pte,index,va,fault 418 444 #if PT_NLEVELS == 3 419 - EXTR \va,31-ASM_PMD_SHIFT,ASM_BITS_PER_PMD,\index 445 + extru \va,31-ASM_PMD_SHIFT,ASM_BITS_PER_PMD,\index 420 446 #else 421 - EXTR \va,31-ASM_PGDIR_SHIFT,ASM_BITS_PER_PGD,\index 447 + extru \va,31-ASM_PGDIR_SHIFT,ASM_BITS_PER_PGD,\index 422 448 #endif 423 - DEP %r0,31,PAGE_SHIFT,\pmd /* clear offset */ 449 + dep %r0,31,PAGE_SHIFT,\pmd /* clear offset */ 424 450 copy %r0,\pte 425 451 ldw,s \index(\pmd),\pmd 426 452 bb,>=,n \pmd,_PxD_PRESENT_BIT,\fault 427 - DEP %r0,31,PxD_FLAG_SHIFT,\pmd /* clear flags */ 453 + dep %r0,31,PxD_FLAG_SHIFT,\pmd /* clear flags */ 428 454 copy \pmd,%r9 429 455 SHLREG %r9,PxD_VALUE_SHIFT,\pmd 430 - EXTR \va,31-PAGE_SHIFT,ASM_BITS_PER_PTE,\index 431 - DEP %r0,31,PAGE_SHIFT,\pmd /* clear offset */ 456 + extru \va,31-PAGE_SHIFT,ASM_BITS_PER_PTE,\index 457 + dep %r0,31,PAGE_SHIFT,\pmd /* clear offset */ 432 458 shladd \index,BITS_PER_PTE_ENTRY,\pmd,\pmd 433 459 LDREG %r0(\pmd),\pte /* pmd is now pte */ 434 460 bb,>=,n \pte,_PAGE_PRESENT_BIT,\fault ··· 579 605 depdi 0,31,32,\tmp 580 606 #endif 581 607 copy \va,\tmp1 582 - DEPI 0,31,23,\tmp1 608 + depi 0,31,23,\tmp1 583 609 cmpb,COND(<>),n \tmp,\tmp1,\fault 584 610 ldi (_PAGE_DIRTY|_PAGE_WRITE|_PAGE_READ),\prot 585 611 depd,z \prot,8,7,\prot