mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 05:11:48 +00:00
32aaeffbd4
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
Revert "tracing: Include module.h in define_trace.h"
irq: don't put module.h into irq.h for tracking irqgen modules.
bluetooth: macroize two small inlines to avoid module.h
ip_vs.h: fix implicit use of module_get/module_put from module.h
nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
include: replace linux/module.h with "struct module" wherever possible
include: convert various register fcns to macros to avoid include chaining
crypto.h: remove unused crypto_tfm_alg_modname() inline
uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
pm_runtime.h: explicitly requires notifier.h
linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
miscdevice.h: fix up implicit use of lists and types
stop_machine.h: fix implicit use of smp.h for smp_processor_id
of: fix implicit use of errno.h in include/linux/of.h
of_platform.h: delete needless include <linux/module.h>
acpi: remove module.h include from platform/aclinux.h
miscdevice.h: delete unnecessary inclusion of module.h
device_cgroup.h: delete needless include <linux/module.h>
net: sch_generic remove redundant use of <linux/module.h>
net: inet_timewait_sock doesnt need <linux/module.h>
...
Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
- drivers/media/dvb/frontends/dibx000_common.c
- drivers/media/video/{mt9m111.c,ov6650.c}
- drivers/mfd/ab3550-core.c
- include/linux/dmaengine.h
83 lines
1.8 KiB
C
83 lines
1.8 KiB
C
/*
|
|
* arch/sh/kernel/topology.c
|
|
*
|
|
* Copyright (C) 2007 Paul Mundt
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
#include <linux/cpu.h>
|
|
#include <linux/cpumask.h>
|
|
#include <linux/init.h>
|
|
#include <linux/percpu.h>
|
|
#include <linux/topology.h>
|
|
#include <linux/node.h>
|
|
#include <linux/nodemask.h>
|
|
#include <linux/export.h>
|
|
|
|
static DEFINE_PER_CPU(struct cpu, cpu_devices);
|
|
|
|
cpumask_t cpu_core_map[NR_CPUS];
|
|
EXPORT_SYMBOL(cpu_core_map);
|
|
|
|
static cpumask_t cpu_coregroup_map(unsigned int cpu)
|
|
{
|
|
/*
|
|
* Presently all SH-X3 SMP cores are multi-cores, so just keep it
|
|
* simple until we have a method for determining topology..
|
|
*/
|
|
return cpu_possible_map;
|
|
}
|
|
|
|
const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
|
|
{
|
|
return &cpu_core_map[cpu];
|
|
}
|
|
|
|
int arch_update_cpu_topology(void)
|
|
{
|
|
unsigned int cpu;
|
|
|
|
for_each_possible_cpu(cpu)
|
|
cpu_core_map[cpu] = cpu_coregroup_map(cpu);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __init topology_init(void)
|
|
{
|
|
int i, ret;
|
|
|
|
#ifdef CONFIG_NEED_MULTIPLE_NODES
|
|
for_each_online_node(i)
|
|
register_one_node(i);
|
|
#endif
|
|
|
|
for_each_present_cpu(i) {
|
|
struct cpu *c = &per_cpu(cpu_devices, i);
|
|
|
|
c->hotpluggable = 1;
|
|
|
|
ret = register_cpu(c, i);
|
|
if (unlikely(ret))
|
|
printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
|
|
__func__, i, ret);
|
|
}
|
|
|
|
#if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)
|
|
/*
|
|
* In the UP case, make sure the CPU association is still
|
|
* registered under each node. Without this, sysfs fails
|
|
* to make the connection between nodes other than node0
|
|
* and cpu0.
|
|
*/
|
|
for_each_online_node(i)
|
|
if (i != numa_node_id())
|
|
register_cpu_under_node(raw_smp_processor_id(), i);
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
subsys_initcall(topology_init);
|