diff options
author | Hirokazu Takata <takata@linux-m32r.org> | 2007-08-17 11:10:18 -0400 |
---|---|---|
committer | Hirokazu Takata <takata@linux-m32r.org> | 2007-09-02 22:30:19 -0400 |
commit | de2232edb8d82aca938570eb6f136e2d70a26418 (patch) | |
tree | 3645780bc45a414bc13e5e7117d95db447c35efe /arch/m32r/kernel/entry.S | |
parent | abd0a782359717ded8f663bc5b8e5e9e3cc4f5e7 (diff) |
m32r: Cosmetic updates of arch/m32r/kernel/entry.S
- Remove unused symbols *_MASK
- Change indentation of comments, etc.
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Diffstat (limited to 'arch/m32r/kernel/entry.S')
-rw-r--r-- | arch/m32r/kernel/entry.S | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S index 4b3a7742fe47..450b106ee613 100644 --- a/arch/m32r/kernel/entry.S +++ b/arch/m32r/kernel/entry.S | |||
@@ -109,13 +109,6 @@ | |||
109 | #define SP(reg) @(0x68,reg) | 109 | #define SP(reg) @(0x68,reg) |
110 | #define ORIG_R0(reg) @(0x6C,reg) | 110 | #define ORIG_R0(reg) @(0x6C,reg) |
111 | 111 | ||
112 | CF_MASK = 0x00000001 | ||
113 | TF_MASK = 0x00000100 | ||
114 | IF_MASK = 0x00000200 | ||
115 | DF_MASK = 0x00000400 | ||
116 | NT_MASK = 0x00004000 | ||
117 | VM_MASK = 0x00020000 | ||
118 | |||
119 | #ifdef CONFIG_PREEMPT | 112 | #ifdef CONFIG_PREEMPT |
120 | #define preempt_stop(x) CLI(x) | 113 | #define preempt_stop(x) CLI(x) |
121 | #else | 114 | #else |
@@ -295,7 +288,7 @@ ENTRY(ei_handler) | |||
295 | #endif | 288 | #endif |
296 | SAVE_ALL | 289 | SAVE_ALL |
297 | mv r1, sp ; arg1(regs) | 290 | mv r1, sp ; arg1(regs) |
298 | ; GET_ICU_STATUS; | 291 | ; get ICU status |
299 | seth r0, #shigh(M32R_ICU_ISTS_ADDR) | 292 | seth r0, #shigh(M32R_ICU_ISTS_ADDR) |
300 | ld r0, @(low(M32R_ICU_ISTS_ADDR),r0) | 293 | ld r0, @(low(M32R_ICU_ISTS_ADDR),r0) |
301 | push r0 | 294 | push r0 |
@@ -377,6 +370,7 @@ ENTRY(ei_handler) | |||
377 | .fillinsn | 370 | .fillinsn |
378 | 5: | 371 | 5: |
379 | #endif /* CONFIG_PLAT_HAS_INT2ICU */ | 372 | #endif /* CONFIG_PLAT_HAS_INT2ICU */ |
373 | |||
380 | check_end: | 374 | check_end: |
381 | bl do_IRQ | 375 | bl do_IRQ |
382 | pop r14 | 376 | pop r14 |
@@ -467,7 +461,7 @@ inst: | |||
467 | 461 | ||
468 | 462 | ||
469 | ENTRY(alignment_check) | 463 | ENTRY(alignment_check) |
470 | /* void alignment_check(int error_code) */ | 464 | /* void alignment_check(int error_code) */ |
471 | SWITCH_TO_KERNEL_STACK | 465 | SWITCH_TO_KERNEL_STACK |
472 | SAVE_ALL | 466 | SAVE_ALL |
473 | ldi r1, #0x30 ; error_code | 467 | ldi r1, #0x30 ; error_code |
@@ -477,7 +471,7 @@ error_code: | |||
477 | bra ret_from_exception | 471 | bra ret_from_exception |
478 | 472 | ||
479 | ENTRY(rie_handler) | 473 | ENTRY(rie_handler) |
480 | /* void rie_handler(int error_code) */ | 474 | /* void rie_handler(int error_code) */ |
481 | SWITCH_TO_KERNEL_STACK | 475 | SWITCH_TO_KERNEL_STACK |
482 | SAVE_ALL | 476 | SAVE_ALL |
483 | ldi r1, #0x20 ; error_code | 477 | ldi r1, #0x20 ; error_code |
@@ -486,7 +480,7 @@ ENTRY(rie_handler) | |||
486 | bra error_code | 480 | bra error_code |
487 | 481 | ||
488 | ENTRY(pie_handler) | 482 | ENTRY(pie_handler) |
489 | /* void pie_handler(int error_code) */ | 483 | /* void pie_handler(int error_code) */ |
490 | SWITCH_TO_KERNEL_STACK | 484 | SWITCH_TO_KERNEL_STACK |
491 | SAVE_ALL | 485 | SAVE_ALL |
492 | ldi r1, #0 ; error_code ; FIXME | 486 | ldi r1, #0 ; error_code ; FIXME |
@@ -495,8 +489,8 @@ ENTRY(pie_handler) | |||
495 | bra error_code | 489 | bra error_code |
496 | 490 | ||
497 | ENTRY(debug_trap) | 491 | ENTRY(debug_trap) |
498 | .global withdraw_debug_trap | ||
499 | /* void debug_trap(void) */ | 492 | /* void debug_trap(void) */ |
493 | .global withdraw_debug_trap | ||
500 | SWITCH_TO_KERNEL_STACK | 494 | SWITCH_TO_KERNEL_STACK |
501 | SAVE_ALL | 495 | SAVE_ALL |
502 | mv r0, sp ; pt_regs | 496 | mv r0, sp ; pt_regs |
@@ -515,11 +509,9 @@ ENTRY(ill_trap) | |||
515 | bl do_ill_trap | 509 | bl do_ill_trap |
516 | bra error_code | 510 | bra error_code |
517 | 511 | ||
518 | |||
519 | /* Cache flushing handler */ | ||
520 | ENTRY(cache_flushing_handler) | 512 | ENTRY(cache_flushing_handler) |
521 | .global _flush_cache_all | ||
522 | /* void _flush_cache_all(void); */ | 513 | /* void _flush_cache_all(void); */ |
514 | .global _flush_cache_all | ||
523 | SWITCH_TO_KERNEL_STACK | 515 | SWITCH_TO_KERNEL_STACK |
524 | push r0 | 516 | push r0 |
525 | push r1 | 517 | push r1 |