diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-10-25 10:58:34 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-25 10:58:34 -0400 |
| commit | 4cafc4b8d7219b70e15f22e4a51b3ce847810caf (patch) | |
| tree | 8051ea3f36f0682d08f47df8e35e14ca7eb7a5d7 /arch/mips/kernel/branch.c | |
| parent | b47fad3bfb5940cc3e28a1c69716f6dc44e4b7e6 (diff) | |
| parent | dbd1e66e04558a582e673bc4a9cd933ce0228d93 (diff) | |
Merge branch 'oprofile/core' into oprofile/x86
Conflicts:
arch/x86/oprofile/op_model_amd.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/mips/kernel/branch.c')
| -rw-r--r-- | arch/mips/kernel/branch.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index 0176ed015c89..32103cc2a257 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c | |||
| @@ -40,7 +40,6 @@ int __compute_return_epc(struct pt_regs *regs) | |||
| 40 | return -EFAULT; | 40 | return -EFAULT; |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | regs->regs[0] = 0; | ||
| 44 | switch (insn.i_format.opcode) { | 43 | switch (insn.i_format.opcode) { |
| 45 | /* | 44 | /* |
| 46 | * jr and jalr are in r_format format. | 45 | * jr and jalr are in r_format format. |