parisc: Use zdep for shlw macro on PA1.1 and PA2.0

The zdep and depw,z mnemonics generate the same code. The assembler will
accept the depw,z mnemonic when generating PA 1.x code. The zdep
mnemonic is okay when generating PA 2.0 code. This patch changes depw,z
to zdep in the current shlw macro, while the binary code will be the
same.

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: John David Anglin <dave.anglin@bell.net>

diff --git a/arch/parisc/include/asm/assembly.h b/arch/parisc/include/asm/assembly.h
index e9c6385ef0d16235dd24ff256a9ea9181745c355..c17ec0ee6e7cba0d02a14db84aafa09694d4d860 100644 (file)
--- a/arch/parisc/include/asm/assembly.h
+++ b/arch/parisc/include/asm/assembly.h
@@ -129,15 +129,8 @@
        .macro  debug value
        .endm
 
-
-       /* Shift Left - note the r and t can NOT be the same! */
-       .macro shl r, sa, t
-       dep,z   \r, 31-(\sa), 32-(\sa), \t
-       .endm
-
-       /* The PA 2.0 shift left */
        .macro shlw r, sa, t
-       depw,z  \r, 31-(\sa), 32-(\sa), \t
+       zdep    \r, 31-(\sa), 32-(\sa), \t
        .endm
 
        /* And the PA 2.0W shift left */