diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-04 20:17:45 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-04 20:17:45 +0300 |
| commit | 0a23ea65ce9f10ec2ea392571006b781b150327f (patch) | |
| tree | 1906d633c94131ed850b8b8b0672bc774b694697 /arch/sparc/power/hibernate.c | |
| parent | c63716ab4d77f3df7d12260fc62cbf847c2a85d1 (diff) | |
| parent | 0ede1c401332173ab0693121dc6cde04a4dbf131 (diff) | |
| download | linux-0a23ea65ce9f10ec2ea392571006b781b150327f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
- block interrupts properly across the entire MMU context change (both
the hw MMU context change and the TSB table change) so that we don't
get a perf event interrupt in the middle. From Rob Gardner.
- be sure to register hugepages early enough, from Nitin Gupta.
- UltraSPARC-III user copy exception handling would return garbage for
the copied length in some circumstances.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Fix exception handling in UltraSPARC-III memcpy.
sbus: Convert to using %pOF instead of full_name
sparc: defconfig: Cleanup from old Kconfig options
sparc64: Register hugepages during arch init
sparc64: Prevent perf from running during super critical sections
Diffstat (limited to 'arch/sparc/power/hibernate.c')
| -rw-r--r-- | arch/sparc/power/hibernate.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/power/hibernate.c b/arch/sparc/power/hibernate.c index 17bd2e167e07..df707a8ad311 100644 --- a/arch/sparc/power/hibernate.c +++ b/arch/sparc/power/hibernate.c @@ -35,6 +35,5 @@ void restore_processor_state(void) { struct mm_struct *mm = current->active_mm; - load_secondary_context(mm); - tsb_context_switch(mm); + tsb_context_switch_ctx(mm, CTX_HWBITS(mm->context)); } |