diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-29 23:43:19 -0400 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-29 23:43:19 -0400 |
| commit | 719dbb2df78fc9a40e28392b07cd715bfc5a665c (patch) | |
| tree | 0bbc3b84b74178d18164f5522ee3715623f94bbe /arch/powerpc/include/asm/exception-64s.h | |
| parent | fbef66f0adcddf4475e19f3d09df22fb34e633f6 (diff) | |
| parent | 9f595fd8b54809fed13fc30906ef1e90a3fcfbc9 (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include more 8xx optimizations, device tree updates,
and MVME7100 support."
Diffstat (limited to 'arch/powerpc/include/asm/exception-64s.h')
| -rw-r--r-- | arch/powerpc/include/asm/exception-64s.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h index c7d27739ea28..bed66e5743b3 100644 --- a/arch/powerpc/include/asm/exception-64s.h +++ b/arch/powerpc/include/asm/exception-64s.h | |||
| @@ -287,7 +287,7 @@ do_kvm_##n: \ | |||
| 287 | std r0,GPR0(r1); /* save r0 in stackframe */ \ | 287 | std r0,GPR0(r1); /* save r0 in stackframe */ \ |
| 288 | std r10,GPR1(r1); /* save r1 in stackframe */ \ | 288 | std r10,GPR1(r1); /* save r1 in stackframe */ \ |
| 289 | beq 4f; /* if from kernel mode */ \ | 289 | beq 4f; /* if from kernel mode */ \ |
| 290 | ACCOUNT_CPU_USER_ENTRY(r9, r10); \ | 290 | ACCOUNT_CPU_USER_ENTRY(r13, r9, r10); \ |
| 291 | SAVE_PPR(area, r9, r10); \ | 291 | SAVE_PPR(area, r9, r10); \ |
| 292 | 4: EXCEPTION_PROLOG_COMMON_2(area) \ | 292 | 4: EXCEPTION_PROLOG_COMMON_2(area) \ |
| 293 | EXCEPTION_PROLOG_COMMON_3(n) \ | 293 | EXCEPTION_PROLOG_COMMON_3(n) \ |