diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-01-31 17:42:56 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-01-31 17:42:56 +1100 |
| commit | 84f3467cf95a6a4545d95c4dbd95692e5c0798f1 (patch) | |
| tree | fc8ec93e22ae1008c6486c6e949618d8b9078027 /arch/arc/kernel | |
| parent | beaddd44985f98441bcdd5c624aa02261f6f9172 (diff) | |
| parent | d5cd4249c55f8225911bf36572b11040975cdcea (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/arc/kernel')
| -rw-r--r-- | arch/arc/kernel/smp.c | 4 | ||||
| -rw-r--r-- | arch/arc/kernel/unwind.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arc/kernel/smp.c b/arch/arc/kernel/smp.c index 2afbafadb6ab..b8e8d3944481 100644 --- a/arch/arc/kernel/smp.c +++ b/arch/arc/kernel/smp.c @@ -139,8 +139,8 @@ void start_kernel_secondary(void) /* MMU, Caches, Vector Table, Interrupts etc */ setup_processor(); - atomic_inc(&mm->mm_users); - atomic_inc(&mm->mm_count); + mmget(mm); + mmgrab(mm); current->active_mm = mm; cpumask_set_cpu(cpu, mm_cpumask(mm)); diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c index 61fd1ce63c56..b6e4f7a7419b 100644 --- a/arch/arc/kernel/unwind.c +++ b/arch/arc/kernel/unwind.c @@ -1051,9 +1051,9 @@ int arc_unwind(struct unwind_frame_info *frame) ++ptr; } if (cie != NULL) { - /* get code aligment factor */ + /* get code alignment factor */ state.codeAlign = get_uleb128(&ptr, end); - /* get data aligment factor */ + /* get data alignment factor */ state.dataAlign = get_sleb128(&ptr, end); if (state.codeAlign == 0 || state.dataAlign == 0 || ptr >= end) cie = NULL; |