Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b616c8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: We need to use compat_sys_ustat() as well.
  sparc64: Fix MM refcount check in smp_flush_tlb_pending().
parents febb02bd 6e8a4fa6

arch/sparc/kernel/smp_64.c

+2 −2
Original line number Diff line number Diff line
@@ -1031,7 +1031,7 @@ void smp_fetch_global_regs(void) 
 *    If the address space is non-shared (ie. mm->count == 1) we avoid

 *    cross calls when we want to flush the currently running process's

 *    tlb state.  This is done by clearing all cpu bits except the current

 *    processor's in current->active_mm->cpu_vm_mask and performing the

 *    processor's in current->mm->cpu_vm_mask and performing the

 *    flush locally only.  This will force any subsequent cpus which run

 *    this task to flush the context from the local tlb if the process

 *    migrates to another cpu (again).
@@ -1074,7 +1074,7 @@ void smp_flush_tlb_pending(struct mm_struct *mm, unsigned long nr, unsigned long 
	u32 ctx = CTX_HWBITS(mm->context);

	int cpu = get_cpu();



	if (mm == current->active_mm && atomic_read(&mm->mm_users) == 1)

	if (mm == current->mm && atomic_read(&mm->mm_users) == 1)

		mm->cpu_vm_mask = cpumask_of_cpu(cpu);

	else

		smp_cross_call_masked(&xcall_flush_tlb_pending,

arch/sparc/kernel/systbls_64.S

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ sys_call_table32: 
/*150*/	.word sys_nis_syscall, sys_inotify_init, sys_inotify_add_watch, sys_poll, sys_getdents64

	.word compat_sys_fcntl64, sys_inotify_rm_watch, compat_sys_statfs, compat_sys_fstatfs, sys_oldumount

/*160*/	.word compat_sys_sched_setaffinity, compat_sys_sched_getaffinity, sys32_getdomainname, sys32_setdomainname, sys_nis_syscall

	.word sys_quotactl, sys_set_tid_address, compat_sys_mount, sys_ustat, sys32_setxattr

	.word sys_quotactl, sys_set_tid_address, compat_sys_mount, compat_sys_ustat, sys32_setxattr

/*170*/	.word sys32_lsetxattr, sys32_fsetxattr, sys_getxattr, sys_lgetxattr, compat_sys_getdents

	.word sys_setsid, sys_fchdir, sys32_fgetxattr, sys_listxattr, sys_llistxattr

/*180*/	.word sys32_flistxattr, sys_removexattr, sys_lremovexattr, compat_sys_sigpending, sys_ni_syscall