diff options
| author | Linus Torvalds | 2013-07-03 20:14:04 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2013-07-03 20:14:04 +0200 |
| commit | e39dfe52f8f67061317e7108f62a2b33a3d06580 (patch) | |
| tree | 831ac8b5c012c868f1af50e7843c6598390d9fff /arch/ia64/kernel/numa.c | |
| parent | Merge branch 'exotic-arch-fixes' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | [IA64] Delete __cpuinit usage from all ia64 users (diff) | |
| download | kernel-qcow2-linux-e39dfe52f8f67061317e7108f62a2b33a3d06580.tar.gz kernel-qcow2-linux-e39dfe52f8f67061317e7108f62a2b33a3d06580.tar.xz kernel-qcow2-linux-e39dfe52f8f67061317e7108f62a2b33a3d06580.zip | |
Merge tag 'please-pull-misc-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull misc ia64 updates from Tony Luck:
"Miscellaneous ia64 changes for 3.11 merge window"
* tag 'please-pull-misc-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
[IA64] Delete __cpuinit usage from all ia64 users
[IA64] hpsim: Fix check for overlong simscsi prefix.
[IA64] pci: Remove unused fallback_dev
[IA64] perfmon: Use %*phD specifier to dump small buffers
[IA64] Fix trap #45 handling
Diffstat (limited to 'arch/ia64/kernel/numa.c')
| -rw-r--r-- | arch/ia64/kernel/numa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/numa.c b/arch/ia64/kernel/numa.c index c93420c97409..d288cde93606 100644 --- a/arch/ia64/kernel/numa.c +++ b/arch/ia64/kernel/numa.c @@ -30,7 +30,7 @@ EXPORT_SYMBOL(cpu_to_node_map); cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned; EXPORT_SYMBOL(node_to_cpu_mask); -void __cpuinit map_cpu_to_node(int cpu, int nid) +void map_cpu_to_node(int cpu, int nid) { int oldnid; if (nid < 0) { /* just initialize by zero */ @@ -51,7 +51,7 @@ void __cpuinit map_cpu_to_node(int cpu, int nid) return; } -void __cpuinit unmap_cpu_from_node(int cpu, int nid) +void unmap_cpu_from_node(int cpu, int nid) { WARN_ON(!cpu_isset(cpu, node_to_cpu_mask[nid])); WARN_ON(cpu_to_node_map[cpu] != nid); |