diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-18 04:57:02 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-18 04:57:02 -0400 |
commit | 37ba317c9ed19eb126e40bbf563f2711e191a636 (patch) | |
tree | c5865768f341fc0ab41899fe9af9dc5918784cee /arch/parisc/kernel/entry.S | |
parent | 708dc5125309cd33c5daaad3026cc4ae6ef39c8b (diff) | |
parent | ee568b25ee9e160b32d1aef73d8b2ee9c05d34db (diff) |
Merge branches 'sched/cleanups' and 'linus' into sched/core
Diffstat (limited to 'arch/parisc/kernel/entry.S')
-rw-r--r-- | arch/parisc/kernel/entry.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index d1fa4edd2d80..0db9fdcb7709 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S | |||
@@ -368,7 +368,7 @@ | |||
368 | * abstractions for the macros */ | 368 | * abstractions for the macros */ |
369 | .macro EXTR reg1,start,length,reg2 | 369 | .macro EXTR reg1,start,length,reg2 |
370 | #ifdef CONFIG_64BIT | 370 | #ifdef CONFIG_64BIT |
371 | extrd,u \reg1,32+\start,\length,\reg2 | 371 | extrd,u \reg1,32+(\start),\length,\reg2 |
372 | #else | 372 | #else |
373 | extrw,u \reg1,\start,\length,\reg2 | 373 | extrw,u \reg1,\start,\length,\reg2 |
374 | #endif | 374 | #endif |
@@ -376,7 +376,7 @@ | |||
376 | 376 | ||
377 | .macro DEP reg1,start,length,reg2 | 377 | .macro DEP reg1,start,length,reg2 |
378 | #ifdef CONFIG_64BIT | 378 | #ifdef CONFIG_64BIT |
379 | depd \reg1,32+\start,\length,\reg2 | 379 | depd \reg1,32+(\start),\length,\reg2 |
380 | #else | 380 | #else |
381 | depw \reg1,\start,\length,\reg2 | 381 | depw \reg1,\start,\length,\reg2 |
382 | #endif | 382 | #endif |
@@ -384,7 +384,7 @@ | |||
384 | 384 | ||
385 | .macro DEPI val,start,length,reg | 385 | .macro DEPI val,start,length,reg |
386 | #ifdef CONFIG_64BIT | 386 | #ifdef CONFIG_64BIT |
387 | depdi \val,32+\start,\length,\reg | 387 | depdi \val,32+(\start),\length,\reg |
388 | #else | 388 | #else |
389 | depwi \val,\start,\length,\reg | 389 | depwi \val,\start,\length,\reg |
390 | #endif | 390 | #endif |