[3.13.y-ckt stable] Patch "of: return NUMA_NO_NODE from fallback of_node_to_nid()" has been added to staging queue

[Kamal Mostafa]

This is a note to let you know that I have just added a patch titled

    of: return NUMA_NO_NODE from fallback of_node_to_nid()

to the linux-3.13.y-queue branch of the 3.13.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.13.y-queue

This patch is scheduled to be released in version 3.13.11-ckt24.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.13.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From d82d7501852b2c4baa6ba10a1e48f8996fbfd208 Mon Sep 17 00:00:00 2001
From: Konstantin Khlebnikov <khlebnikov at yandex-team.ru>
Date: Wed, 8 Apr 2015 19:59:20 +0300
Subject: of: return NUMA_NO_NODE from fallback of_node_to_nid()

commit c8fff7bc5bba6bd59cad40441c189c4efe7190f6 upstream.

Node 0 might be offline as well as any other numa node,
in this case kernel cannot handle memory allocation and crashes.

Signed-off-by: Konstantin Khlebnikov <khlebnikov at yandex-team.ru>
Fixes: 0c3f061c195c ("of: implement of_node_to_nid as a weak function")
Signed-off-by: Grant Likely <grant.likely at linaro.org>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 drivers/of/base.c  | 2 +-
 include/linux/of.h | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 6c0dcf5..6996c77 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -77,7 +77,7 @@ EXPORT_SYMBOL(of_n_size_cells);
 #ifdef CONFIG_NUMA
 int __weak of_node_to_nid(struct device_node *np)
 {
-	return numa_node_id();
+	return NUMA_NO_NODE;
 }
 #endif

diff --git a/include/linux/of.h b/include/linux/of.h
index 6e47b7f..bb7a1a9 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -553,7 +553,10 @@ static inline const char *of_prop_next_string(struct property *prop,
 #if defined(CONFIG_OF) && defined(CONFIG_NUMA)
 extern int of_node_to_nid(struct device_node *np);
 #else
-static inline int of_node_to_nid(struct device_node *device) { return 0; }
+static inline int of_node_to_nid(struct device_node *device)
+{
+	return NUMA_NO_NODE;
+}
 #endif

 /**
--
1.9.1