···77#define __MM_ID_H8899struct mm_id {1010- union {1111- int mm_fd;1212- int pid;1313- } u;1010+ int pid;1411 unsigned long stack;1512 int syscall_data_len;1613};
+1-1
arch/um/kernel/reboot.c
···2929 t = find_lock_task_mm(p);3030 if (!t)3131 continue;3232- pid = t->mm->context.id.u.pid;3232+ pid = t->mm->context.id.pid;3333 task_unlock(t);3434 os_kill_ptraced_process(pid, 1);3535 }
+6-6
arch/um/kernel/skas/mmu.c
···3232 new_id->stack = stack;33333434 block_signals_trace();3535- new_id->u.pid = start_userspace(stack);3535+ new_id->pid = start_userspace(stack);3636 unblock_signals_trace();37373838- if (new_id->u.pid < 0) {3939- ret = new_id->u.pid;3838+ if (new_id->pid < 0) {3939+ ret = new_id->pid;4040 goto out_free;4141 }4242···8383 * whole UML suddenly dying. Also, cover negative and8484 * 1 cases, since they shouldn't happen either.8585 */8686- if (mmu->id.u.pid < 2) {8686+ if (mmu->id.pid < 2) {8787 printk(KERN_ERR "corrupt mm_context - pid = %d\n",8888- mmu->id.u.pid);8888+ mmu->id.pid);8989 return;9090 }9191- os_kill_ptraced_process(mmu->id.u.pid, 1);9191+ os_kill_ptraced_process(mmu->id.pid, 1);92929393 free_pages(mmu->id.stack, ilog2(STUB_DATA_PAGES));9494}
···7878{7979 struct stub_data *proc_data = (void *)mm_idp->stack;8080 int n, i;8181- int err, pid = mm_idp->u.pid;8181+ int err, pid = mm_idp->pid;82828383 n = ptrace_setregs(pid, syscall_regs);8484 if (n < 0) {