[2.6 patch] asm-mips/mach-ip27/topology.h must #include <asm-generic/topology.h>

Previous thread: [Cbe-oss-dev] [PATCH] Reworked Cell OProfile: SPU mutex lock fix by Carl Love on Wednesday, April 23, 2008 - 11:50 am. (2 messages)

Next thread: mips ptrace compat build error by Adrian Bunk on Wednesday, April 23, 2008 - 12:06 pm. (2 messages)
To: <ralf@...>
Cc: <linux-mips@...>, <linux-kernel@...>
Date: Wednesday, April 23, 2008 - 11:55 am

This patch fixes the following compile error:

<-- snip -->

...
CC kernel/sched.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c: In function 'find_next_best_node':
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: implicit declaration of function 'node_to_cpumask_ptr'
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: '__tmp__' undeclared (first use in this function)
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: (Each undeclared identifier is reported only once
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: for each function it appears in.)
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c: In function 'sched_domain_node_span':
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7047: error: 'nodemask' undeclared (first use in this function)
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7048: warning: ISO C90 forbids mixed declarations and code
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7059: error: implicit declaration of function 'node_to_cpumask_ptr_next'
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c: In function '__build_sched_domains':
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7605: error: 'pnodemask' undeclared (first use in this function)
make[2]: *** [kernel/sched.o] Error 1

<-- snip -->

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---
95146e0f305fd55f05b24d26dd671b5b0a1f657c diff --git a/include/asm-mips/mach-ip27/topology.h b/include/asm-mips/mach-ip27/topology.h
index 372291f..7785bec 100644
--- a/include/asm-mips/mach-ip27/topology.h
+++ b/include/asm-mips/mach-ip27/topology.h
@@ -54,4 +54,6 @@ extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES];
.nr_balance_failed = 0, \
}

+#include <asm-generic/topology.h>
+
#endif /* _ASM_MACH_TOPOLOGY_H */

--

To: Adrian Bunk <bunk@...>
Cc: <linux-mips@...>, <linux-kernel@...>
Date: Monday, April 28, 2008 - 5:35 am

Thanks, applied.

Ralf
--

Previous thread: [Cbe-oss-dev] [PATCH] Reworked Cell OProfile: SPU mutex lock fix by Carl Love on Wednesday, April 23, 2008 - 11:50 am. (2 messages)

Next thread: mips ptrace compat build error by Adrian Bunk on Wednesday, April 23, 2008 - 12:06 pm. (2 messages)