[patch -mm 4/5] x86_64: fake numa function annotations

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Andrew Morton <akpm@...>
Cc: Andi Kleen <ak@...>, Rohit Seth <rohitseth@...>, <linux-kernel@...>
Date: Thursday, January 25, 2007 - 5:37 pm

Mark the new numa=fake x86_64 helper functions, setup_node_range(),
split_nodes_equally(), and split_nodes_by_size() as __init.

Cc: Andi Kleen <ak@suse.de>
Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
---
 arch/x86_64/mm/numa.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c
index 2ee228b..5d8fee6 100644
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86_64/mm/numa.c
@@ -287,8 +287,8 @@ char *cmdline __initdata;
  * if there is additional memory left for allocation past addr and -1 otherwise.
  * addr is adjusted to be at the end of the node.
  */
-static int setup_node_range(int nid, struct bootnode *nodes, u64 *addr,
-			    u64 size, u64 max_addr)
+static int __init setup_node_range(int nid, struct bootnode *nodes, u64 *addr,
+				   u64 size, u64 max_addr)
 {
 	int ret = 0;
 	nodes[nid].start = *addr;
@@ -310,8 +310,9 @@ static int setup_node_range(int nid, struct bootnode *nodes, u64 *addr,
  * is the number of nodes split up and addr is adjusted to be at the end of the
  * last node allocated.
  */
-static int split_nodes_equally(struct bootnode *nodes, u64 *addr, u64 max_addr,
-			       int node_start, int num_nodes)
+static int __init split_nodes_equally(struct bootnode *nodes, u64 *addr,
+				      u64 max_addr, int node_start,
+				      int num_nodes)
 {
 	unsigned int big;
 	u64 size;
@@ -363,8 +364,8 @@ static int split_nodes_equally(struct bootnode *nodes, u64 *addr, u64 max_addr,
  * always assigned to a final node and can be asymmetric.  Returns the number of
  * nodes split.
  */
-static int split_nodes_by_size(struct bootnode *nodes, u64 *addr, u64 max_addr,
-			       int node_start, u64 size)
+static int __init split_nodes_by_size(struct bootnode *nodes, u64 *addr,
+			       u64 max_addr, int node_start, u64 size)
 {
 	int i = node_start;
 	size = (size << 20) & FAKE_NODE_MIN_HASH_MASK;
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[patch -mm 1/5] x86_64: configurable fake numa node sizes, David Rientjes, (Thu Jan 25, 5:37 pm)
[patch -mm 2/5] x86_64: split remaining fake nodes equally, David Rientjes, (Thu Jan 25, 5:37 pm)
[patch -mm 3/5] x86_64: fixed-size remaining fake nodes, David Rientjes, (Thu Jan 25, 5:37 pm)
[patch -mm 4/5] x86_64: fake numa function annotations, David Rientjes, (Thu Jan 25, 5:37 pm)