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

Commit 0e064caf authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'core/futexes' and 'core/iommu' into core/urgent 



Merge reason: Switch from topical split to the stabilization track

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 90a6501f f409adf5 c13f3d37

arch/x86/kernel/aperture_64.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <asm/x86_init.h>



int gart_iommu_aperture;

EXPORT_SYMBOL_GPL(gart_iommu_aperture);

int gart_iommu_aperture_disabled __initdata;

int gart_iommu_aperture_allowed __initdata;

kernel/futex_compat.c

+3 −3
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr, 
		struct task_struct *p;



		ret = -ESRCH;

		read_lock(&tasklist_lock);

		rcu_read_lock();

		p = find_task_by_vpid(pid);

		if (!p)

			goto err_unlock;
@@ -157,7 +157,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr, 
		    !capable(CAP_SYS_PTRACE))

			goto err_unlock;

		head = p->compat_robust_list;

		read_unlock(&tasklist_lock);

		rcu_read_unlock();

	}



	if (put_user(sizeof(*head), len_ptr))
@@ -165,7 +165,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr, 
	return put_user(ptr_to_compat(head), head_ptr);



err_unlock:

	read_unlock(&tasklist_lock);

	rcu_read_unlock();



	return ret;

}