diff options
Diffstat (limited to 'arch/parisc/include/asm/assembly.h')
-rw-r--r-- | arch/parisc/include/asm/assembly.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/parisc/include/asm/assembly.h b/arch/parisc/include/asm/assembly.h index ffb208840ecc..89fb40005e3f 100644 --- a/arch/parisc/include/asm/assembly.h +++ b/arch/parisc/include/asm/assembly.h | |||
@@ -79,6 +79,7 @@ | |||
79 | 79 | ||
80 | #include <asm/asm-offsets.h> | 80 | #include <asm/asm-offsets.h> |
81 | #include <asm/page.h> | 81 | #include <asm/page.h> |
82 | #include <asm/types.h> | ||
82 | 83 | ||
83 | #include <asm/asmregs.h> | 84 | #include <asm/asmregs.h> |
84 | 85 | ||
@@ -129,27 +130,27 @@ | |||
129 | 130 | ||
130 | /* Shift Left - note the r and t can NOT be the same! */ | 131 | /* Shift Left - note the r and t can NOT be the same! */ |
131 | .macro shl r, sa, t | 132 | .macro shl r, sa, t |
132 | dep,z \r, 31-\sa, 32-\sa, \t | 133 | dep,z \r, 31-(\sa), 32-(\sa), \t |
133 | .endm | 134 | .endm |
134 | 135 | ||
135 | /* The PA 2.0 shift left */ | 136 | /* The PA 2.0 shift left */ |
136 | .macro shlw r, sa, t | 137 | .macro shlw r, sa, t |
137 | depw,z \r, 31-\sa, 32-\sa, \t | 138 | depw,z \r, 31-(\sa), 32-(\sa), \t |
138 | .endm | 139 | .endm |
139 | 140 | ||
140 | /* And the PA 2.0W shift left */ | 141 | /* And the PA 2.0W shift left */ |
141 | .macro shld r, sa, t | 142 | .macro shld r, sa, t |
142 | depd,z \r, 63-\sa, 64-\sa, \t | 143 | depd,z \r, 63-(\sa), 64-(\sa), \t |
143 | .endm | 144 | .endm |
144 | 145 | ||
145 | /* Shift Right - note the r and t can NOT be the same! */ | 146 | /* Shift Right - note the r and t can NOT be the same! */ |
146 | .macro shr r, sa, t | 147 | .macro shr r, sa, t |
147 | extru \r, 31-\sa, 32-\sa, \t | 148 | extru \r, 31-(\sa), 32-(\sa), \t |
148 | .endm | 149 | .endm |
149 | 150 | ||
150 | /* pa20w version of shift right */ | 151 | /* pa20w version of shift right */ |
151 | .macro shrd r, sa, t | 152 | .macro shrd r, sa, t |
152 | extrd,u \r, 63-\sa, 64-\sa, \t | 153 | extrd,u \r, 63-(\sa), 64-(\sa), \t |
153 | .endm | 154 | .endm |
154 | 155 | ||
155 | /* load 32-bit 'value' into 'reg' compensating for the ldil | 156 | /* load 32-bit 'value' into 'reg' compensating for the ldil |