The following patch is offered to resolve this problem:
| Adrian Bunk wrote:
|| Commit aa6b54461cc5c0019b9d792adf3176b444c10763
|| (asm-generic: add node_to_cpumask_ptr macro)
|| causes the following build error with migor_defconfig:
||
|| <-- snip -->
||
|| ...
|| CC arch/sh/kernel/asm-offsets.s
|| In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/mm.h:8,
|| from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/kernel/asm-offsets.c:13:
|| /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/gfp.h: In function 'alloc_pages_node':
|| /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/gfp.h:190:
|| error: implicit declaration of function 'cpu_to_node'
|| make[2]: *** [arch/sh/kernel/asm-offsets.s] Error 1
||
Ahh, this is what caused the error. In include/asm-generic/topology.h
cpu_to_node is only defined now if NUMA is turned off.
#ifndef CONFIG_NUMA
/* Other architectures wishing to use this simple topology API should fill
in the below functions as appropriate in their own <asm/topology.h> file. */
#ifndef cpu_to_node
#define cpu_to_node(cpu) ((void)(cpu),0)
#endif
...
So before my change arch 'sh' used the default define whether NUMA was
set or not.
An alternative would be to change all the arch's that define cpu_to_node
as an inline to:
#define cpu_to_node(cpu) _cpu_to_node(cpu)
static inline int _cpu_to_node(int cpu)
{
...
}
Then asm-generic/topology.h could define cpu_to_node if it's not already
defined.
Andrew or Ingo - do you have any preferences?
Thanks,
Mike
Signed-off-by: Mike Travis <travis@sgi.com>
# alpha
Cc: Richard Henderson <rth@twiddle.net>
# powerpc
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
# sh
Cc: Adrian Bunk <bunk@kernel.org>
Cc: lethal@linux-sh.org
Cc: linux-sh@vger.kernel.org
# sparc
Cc: David S. Miller <davem@davemloft.net>
Cc: William L. Irwin <wli@holomorphy.com>
# x86
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
---
--
--
| Linus Torvalds | Linux 2.6.25-rc2 |
| Robin Lee Powell | NFS hang + umount -f: better behaviour requested. |
| David Woodhouse | Re: [GIT *] Allow request_firmware() to be satisfied from in-kernel, use it in mor... |
| Greg KH | [GIT PATCH] driver core patches against 2.6.24 |
git: | |
| Miles Bader | way to automatically add untracked files? |
| Jan-Benedict Glaw | Errors GITtifying GCC and Binutils |
| Andreas Hildebrandt | CVS-$Id:$ replacement in git? |
| Alexander Gladysh | [Q] Encrypted GIT? |
| Alex Thurlow | Router performance on OpenBSD and OpenBGPD |
| Karel Kulhavy | lookup option in /etc/resolv.conf ignored |
| Richard Stallman | Real men don't attack straw men |
| Sunnz | Can OpenBSD do what BusyBox does? |
| Julius Volz | [PATCH RFC 02/24] IPVS: Add genetlink interface implementation |
| Lennart Sorensen | Re: [PATCH 1/2] IPV4: remove addresses and routes when carrier is lost |
| Jussi Kivilinna | [PATCH 04/14] [rndis_host] Halt device if rndis_bind fails. |
| Lennert Buytenhek | Re: using software TSO on non-TSO capable netdevices |
