diff options
| author | Alex Elder <aelder@sgi.com> | 2010-10-21 09:29:34 -0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-10-21 09:29:34 -0400 |
| commit | 39dc948c6921169e13224a97fa53188922acfde8 (patch) | |
| tree | ef9c310031ebc21321d9f10ca6afea90d37a2f57 /arch/mips/kernel/unaligned.c | |
| parent | a731cd116c9334e01bcf3e676c0c621fe7de6ce4 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge branch 'v2.6.36'
Diffstat (limited to 'arch/mips/kernel/unaligned.c')
| -rw-r--r-- | arch/mips/kernel/unaligned.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c index 69b039ca8d83..33d5a5ce4a29 100644 --- a/arch/mips/kernel/unaligned.c +++ b/arch/mips/kernel/unaligned.c | |||
| @@ -109,8 +109,6 @@ static void emulate_load_store_insn(struct pt_regs *regs, | |||
| 109 | unsigned long value; | 109 | unsigned long value; |
| 110 | unsigned int res; | 110 | unsigned int res; |
| 111 | 111 | ||
| 112 | regs->regs[0] = 0; | ||
| 113 | |||
| 114 | /* | 112 | /* |
| 115 | * This load never faults. | 113 | * This load never faults. |
| 116 | */ | 114 | */ |