diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 12:34:58 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 12:34:58 -0500 |
| commit | 9b8b317d58084b9a44f6f33b355c4278d9f841fb (patch) | |
| tree | e0df89800bf4301c4017db3cdf04a2056ec1a852 /arch/mips/loongson | |
| parent | 78c210efdefe07131f91ed512a3308b15bb14e2f (diff) | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
Merge commit 'v2.6.32-rc8' into HEAD
Diffstat (limited to 'arch/mips/loongson')
| -rw-r--r-- | arch/mips/loongson/common/irq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/loongson/common/irq.c b/arch/mips/loongson/common/irq.c index f368c735cbd..b32b4a3e513 100644 --- a/arch/mips/loongson/common/irq.c +++ b/arch/mips/loongson/common/irq.c | |||
| @@ -55,7 +55,6 @@ void __init arch_init_irq(void) | |||
| 55 | * int-handler is not on bootstrap | 55 | * int-handler is not on bootstrap |
| 56 | */ | 56 | */ |
| 57 | clear_c0_status(ST0_IM | ST0_BEV); | 57 | clear_c0_status(ST0_IM | ST0_BEV); |
| 58 | local_irq_disable(); | ||
| 59 | 58 | ||
| 60 | /* setting irq trigger mode */ | 59 | /* setting irq trigger mode */ |
| 61 | set_irq_trigger_mode(); | 60 | set_irq_trigger_mode(); |