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

Commit 34f10fc9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86/xen: fix DomU boot problem
  x86: not set node to cpu_to_node if the node is not online
  x86, i387: fix ptrace leakage using init_fpu()
parents 67171a3f 87d034f3

arch/x86/kernel/i387.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -132,7 +132,7 @@ int xfpregs_get(struct task_struct *target, const struct user_regset *regset, 
	if (!cpu_has_fxsr)

	if (!cpu_has_fxsr)

		return -ENODEV;

		return -ENODEV;





	unlazy_fpu(target);

	init_fpu(target);





	return user_regset_copyout(&pos, &count, &kbuf, &ubuf,

	return user_regset_copyout(&pos, &count, &kbuf, &ubuf,

				   &target->thread.i387.fxsave, 0, -1);

				   &target->thread.i387.fxsave, 0, -1);
@@ -147,7 +147,7 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset, 
	if (!cpu_has_fxsr)

	if (!cpu_has_fxsr)

		return -ENODEV;

		return -ENODEV;





	unlazy_fpu(target);

	init_fpu(target);

	set_stopped_child_used_math(target);

	set_stopped_child_used_math(target);





	ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,

	ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
@@ -307,7 +307,7 @@ int fpregs_get(struct task_struct *target, const struct user_regset *regset, 
	if (!HAVE_HWFP)

	if (!HAVE_HWFP)

		return fpregs_soft_get(target, regset, pos, count, kbuf, ubuf);

		return fpregs_soft_get(target, regset, pos, count, kbuf, ubuf);





	unlazy_fpu(target);

	init_fpu(target);





	if (!cpu_has_fxsr)

	if (!cpu_has_fxsr)

		return user_regset_copyout(&pos, &count, &kbuf, &ubuf,

		return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
@@ -332,7 +332,7 @@ int fpregs_set(struct task_struct *target, const struct user_regset *regset, 
	if (!HAVE_HWFP)

	if (!HAVE_HWFP)

		return fpregs_soft_set(target, regset, pos, count, kbuf, ubuf);

		return fpregs_soft_set(target, regset, pos, count, kbuf, ubuf);





	unlazy_fpu(target);

	init_fpu(target);

	set_stopped_child_used_math(target);

	set_stopped_child_used_math(target);





	if (!cpu_has_fxsr)

	if (!cpu_has_fxsr)

arch/x86/mm/numa_64.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -622,13 +622,17 @@ void __init init_cpu_to_node(void) 
	int i;

	int i;





	for (i = 0; i < NR_CPUS; i++) {

	for (i = 0; i < NR_CPUS; i++) {

		int node;

		u16 apicid = x86_cpu_to_apicid_init[i];

		u16 apicid = x86_cpu_to_apicid_init[i];





		if (apicid == BAD_APICID)

		if (apicid == BAD_APICID)

			continue;

			continue;

		if (apicid_to_node[apicid] == NUMA_NO_NODE)

		node = apicid_to_node[apicid];

		if (node == NUMA_NO_NODE)

			continue;

			continue;

		numa_set_node(i, apicid_to_node[apicid]);

		if (!node_online(node))

			continue;

		numa_set_node(i, node);

	}

	}

}

}

arch/x86/xen/setup.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,8 @@ char * __init xen_memory_setup(void) 
	unsigned long max_pfn = xen_start_info->nr_pages;

	unsigned long max_pfn = xen_start_info->nr_pages;





	e820.nr_map = 0;

	e820.nr_map = 0;

	add_memory_region(0, PFN_PHYS(max_pfn), E820_RAM);

	add_memory_region(0, LOWMEMSIZE(), E820_RAM);

	add_memory_region(HIGH_MEMORY, PFN_PHYS(max_pfn)-HIGH_MEMORY, E820_RAM);





	return "Xen";

	return "Xen";

}

}