Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 (043d0516) · Commits · e / devices / android_kernel_fairphone_FP4

arch/ia64/kernel/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ obj-$(CONFIG_IA64_PALINFO) += palinfo.o
		obj-$(CONFIG_IOSAPIC) += iosapic.o
		obj-$(CONFIG_MODULES) += module.o
		obj-$(CONFIG_SMP) += smp.o smpboot.o domain.o
		obj-$(CONFIG_NUMA) += numa.o
		obj-$(CONFIG_PERFMON) += perfmon_default_smpl.o
		obj-$(CONFIG_IA64_CYCLONE) += cyclone.o
		obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o

arch/ia64/kernel/acpi.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -640,8 +640,10 @@ acpi_boot_init (void)
		if (smp_boot_data.cpu_phys_id[cpu] != hard_smp_processor_id())
		node_cpuid[i++].phys_id = smp_boot_data.cpu_phys_id[cpu];
		}
		build_cpu_to_node_map();
		# endif
		#endif
		#ifdef CONFIG_ACPI_NUMA
		build_cpu_to_node_map();
		#endif
		/* Make boot-up look pretty */
		printk(KERN_INFO "%d CPUs available, %d CPUs total\n", available_cpus, total_cpus);

arch/ia64/kernel/numa.c

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		/*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		*
		* ia64 kernel NUMA specific stuff
		*
		* Copyright (C) 2002 Erich Focht <efocht@ess.nec.de>
		* Copyright (C) 2004 Silicon Graphics, Inc.
		* Jesse Barnes <jbarnes@sgi.com>
		*/
		#include <linux/config.h>
		#include <linux/topology.h>
		#include <linux/module.h>
		#include <asm/processor.h>
		#include <asm/smp.h>

		u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
		EXPORT_SYMBOL(cpu_to_node_map);

		cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;

		/**
		* build_cpu_to_node_map - setup cpu to node and node to cpumask arrays
		*
		* Build cpu to node mapping and initialize the per node cpu masks using
		* info from the node_cpuid array handed to us by ACPI.
		*/
		void __init build_cpu_to_node_map(void)
		{
		int cpu, i, node;

		for(node=0; node < MAX_NUMNODES; node++)
		cpus_clear(node_to_cpu_mask[node]);

		for(cpu = 0; cpu < NR_CPUS; ++cpu) {
		node = -1;
		for (i = 0; i < NR_CPUS; ++i)
		if (cpu_physical_id(cpu) == node_cpuid[i].phys_id) {
		node = node_cpuid[i].nid;
		break;
		}
		cpu_to_node_map[cpu] = (node >= 0) ? node : 0;
		if (node >= 0)
		cpu_set(cpu, node_to_cpu_mask[node]);
		}
		}

arch/ia64/kernel/signal.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -143,6 +143,7 @@ restore_sigcontext (struct sigcontext __user sc, struct sigscratch scr)

		__copy_from_user(current->thread.fph, &sc->sc_fr[32], 96*16);
		psr->mfh = 0; /* drop signal handler's fph contents... */
		preempt_disable();
		if (psr->dfh)
		ia64_drop_fpu(current);
		else {
		@@ -150,6 +151,7 @@ restore_sigcontext (struct sigcontext __user sc, struct sigscratch scr)
		__ia64_load_fpu(current->thread.fph);
		ia64_set_local_fpu_owner(current);
		}
		preempt_enable();
		}
		return err;
		}

arch/ia64/kernel/smpboot.c

+0 −41

Original line number	Diff line number	Diff line
		@@ -525,47 +525,6 @@ smp_build_cpu_map (void)
		}
		}

		#ifdef CONFIG_NUMA

		/* on which node is each logical CPU (one cacheline even for 64 CPUs) */
		u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
		EXPORT_SYMBOL(cpu_to_node_map);
		/* which logical CPUs are on which nodes */
		cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;

		/*
		* Build cpu to node mapping and initialize the per node cpu masks.
		*/
		void __init
		build_cpu_to_node_map (void)
		{
		int cpu, i, node;

		for(node=0; node<MAX_NUMNODES; node++)
		cpus_clear(node_to_cpu_mask[node]);
		for(cpu = 0; cpu < NR_CPUS; ++cpu) {
		/*
		* All Itanium NUMA platforms I know use ACPI, so maybe we
		* can drop this ifdef completely. [EF]
		*/
		#ifdef CONFIG_ACPI_NUMA
		node = -1;
		for (i = 0; i < NR_CPUS; ++i)
		if (cpu_physical_id(cpu) == node_cpuid[i].phys_id) {
		node = node_cpuid[i].nid;
		break;
		}
		#else
		# error Fixme: Dunno how to build CPU-to-node map.
		#endif
		cpu_to_node_map[cpu] = (node >= 0) ? node : 0;
		if (node >= 0)
		cpu_set(cpu, node_to_cpu_mask[node]);
		}
		}

		#endif /* CONFIG_NUMA */

		/*
		* Cycle through the APs sending Wakeup IPIs to boot each.
		*/