mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
topology: alternate fix for ia64 tiger_defconfig build breakage
Define stubs for the numa_*_id() generic percpu related functions for non-NUMA configurations in <asm-generic/topology.h> where the other non-numa stubs live. Fixes ia64 !NUMA build breakage -- e.g., tiger_defconfig Back out now unneeded '#ifndef CONFIG_NUMA' guards from ia64 smpboot.c Signed-off-by: Lee Schermerhorn <[email protected]> Tested-by: Tony Luck <[email protected]> Acked-by: Tony Luck <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
b645bd1286
commit
2510600060
4 changed files with 20 additions and 11 deletions
|
|
@ -5,7 +5,7 @@
|
|||
*
|
||||
* Copyright (C) 2002, IBM Corp.
|
||||
*
|
||||
* All rights reserved.
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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
|
||||
|
|
@ -34,9 +34,16 @@
|
|||
#ifndef cpu_to_node
|
||||
#define cpu_to_node(cpu) ((void)(cpu),0)
|
||||
#endif
|
||||
#ifndef set_numa_node
|
||||
#define set_numa_node(node)
|
||||
#endif
|
||||
#ifndef set_cpu_numa_node
|
||||
#define set_cpu_numa_node(cpu, node)
|
||||
#endif
|
||||
#ifndef cpu_to_mem
|
||||
#define cpu_to_mem(cpu) ((void)(cpu),0)
|
||||
#endif
|
||||
|
||||
#ifndef parent_node
|
||||
#define parent_node(node) ((void)(node),0)
|
||||
#endif
|
||||
|
|
@ -55,4 +62,15 @@
|
|||
|
||||
#endif /* CONFIG_NUMA */
|
||||
|
||||
#if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
|
||||
|
||||
#ifndef set_numa_mem
|
||||
#define set_numa_mem(node)
|
||||
#endif
|
||||
#ifndef set_cpu_numa_mem
|
||||
#define set_cpu_numa_mem(cpu, node)
|
||||
#endif
|
||||
|
||||
#endif /* !CONFIG_NUMA || !CONFIG_HAVE_MEMORYLESS_NODES */
|
||||
|
||||
#endif /* _ASM_GENERIC_TOPOLOGY_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue