diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /arch/mips/kernel/entry.S | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/mips/kernel/entry.S')
| -rw-r--r-- | arch/mips/kernel/entry.S | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S index 01e7fa86aa43..766655f35250 100644 --- a/arch/mips/kernel/entry.S +++ b/arch/mips/kernel/entry.S | |||
| @@ -113,6 +113,21 @@ FEXPORT(restore_all) # restore full frame | |||
| 113 | RESTORE_AT | 113 | RESTORE_AT |
| 114 | RESTORE_STATIC | 114 | RESTORE_STATIC |
| 115 | FEXPORT(restore_partial) # restore partial frame | 115 | FEXPORT(restore_partial) # restore partial frame |
| 116 | #ifdef CONFIG_TRACE_IRQFLAGS | ||
| 117 | SAVE_STATIC | ||
| 118 | SAVE_AT | ||
| 119 | SAVE_TEMP | ||
| 120 | LONG_L v0, PT_STATUS(sp) | ||
| 121 | and v0, 1 | ||
| 122 | beqz v0, 1f | ||
| 123 | jal trace_hardirqs_on | ||
| 124 | b 2f | ||
| 125 | 1: jal trace_hardirqs_off | ||
| 126 | 2: | ||
| 127 | RESTORE_TEMP | ||
| 128 | RESTORE_AT | ||
| 129 | RESTORE_STATIC | ||
| 130 | #endif | ||
| 116 | RESTORE_SOME | 131 | RESTORE_SOME |
| 117 | RESTORE_SP_AND_RET | 132 | RESTORE_SP_AND_RET |
| 118 | .set at | 133 | .set at |