Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36920e06 authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds
Browse files

[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: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarYasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ea817398

include/linux/node.h

+9 −1
Original line number Original line Diff line number Diff line
@@ -30,12 +30,20 @@ extern struct node node_devices[]; 




extern int register_node(struct node *, int, struct node *);

extern int register_node(struct node *, int, struct node *);

extern void unregister_node(struct node *node);

extern void unregister_node(struct node *node);

#ifdef CONFIG_NUMA

extern int register_one_node(int nid);

extern int register_one_node(int nid);

extern void unregister_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 register_cpu_under_node(unsigned int cpu, unsigned int nid);

extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid);

extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid);

#else

#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)

static inline int register_cpu_under_node(unsigned int cpu, unsigned int nid)

{

{

	return 0;

	return 0;