2006-08-25 01:55:20

by Kamezawa Hiroyuki

Subject: [BUG[[PATCH] register_one_node compile fix.

register_one_node()'s should be defined under CONFIG_NUMA=n.
fixes following bug.
--
CC init/version.o
LD init/built-in.o
LD .tmp_vmlinux1
mm/built-in.o: In function `add_memory':
: undefined reference to `register_one_node'
--

Signed-Off-By: KAMEZAWA Hiroyuki <[email protected]>

Index: linux-2.6.18-rc4/include/linux/node.h
===================================================================
--- linux-2.6.18-rc4.orig/include/linux/node.h
+++ linux-2.6.18-rc4/include/linux/node.h
@@ -30,12 +30,20 @@ extern struct node node_devices[];

extern int register_node(struct node *, int, struct node *);
extern void unregister_node(struct node *node);
+#ifdef CONFIG_NUMA
extern int register_one_node(int nid);
extern void unregister_one_node(int nid);
-#ifdef CONFIG_NUMA
extern int register_cpu_under_node(unsigned int cpu, unsigned int nid);
extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid);
#else
+static inline int register_one_node(int nid)
+{
+ return 0;
+}
+static inline int unregister_one_node(int nid)
+{
+ return 0;
+}
static inline int register_cpu_under_node(unsigned int cpu, unsigned int nid)
{
return 0;

2006-08-25 02:52:54

by Yasunori Goto

Subject: Re: [BUG[[PATCH] register_one_node compile fix.

Looks good.
Thanks.

Acked-by: Yasunori Goto <[email protected]>

> register_one_node()'s should be defined under CONFIG_NUMA=n.
> fixes following bug.
> --
> CC init/version.o
> LD init/built-in.o
> LD .tmp_vmlinux1
> mm/built-in.o: In function `add_memory':
> : undefined reference to `register_one_node'
> --
>
> Signed-Off-By: KAMEZAWA Hiroyuki <[email protected]>
>
> Index: linux-2.6.18-rc4/include/linux/node.h
> ===================================================================
> --- linux-2.6.18-rc4.orig/include/linux/node.h
> +++ linux-2.6.18-rc4/include/linux/node.h
> @@ -30,12 +30,20 @@ extern struct node node_devices[];
>
> extern int register_node(struct node *, int, struct node *);
> extern void unregister_node(struct node *node);
> +#ifdef CONFIG_NUMA
> extern int register_one_node(int nid);
> extern void unregister_one_node(int nid);
> -#ifdef CONFIG_NUMA
> extern int register_cpu_under_node(unsigned int cpu, unsigned int nid);
> extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid);
> #else
> +static inline int register_one_node(int nid)
> +{
> + return 0;
> +}
> +static inline int unregister_one_node(int nid)
> +{
> + return 0;
> +}
> static inline int register_cpu_under_node(unsigned int cpu, unsigned int nid)
> {
> return 0;
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

--
Yasunori Goto