[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4D5C3A0F.3080107@kernel.org>
Date: Wed, 16 Feb 2011 12:56:47 -0800
From: Yinghai Lu <yinghai@...nel.org>
To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
"H. Peter Anvin" <hpa@...or.com>
CC: Tejun Heo <tj@...nel.org>, David Rientjes <rientjes@...gle.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: [PATCH] x86, numa: exit early on numa_reset_distance()
Do not call __pa(numa_distance), if it is not allocated before.
it will get BUG_ON if VIRTUAL_DEBUG is on.
Signed-off-by: Yinghai Lu <yinghai@...nel.org>
---
arch/x86/mm/numa_64.c | 6 ++++++
1 file changed, 6 insertions(+)
Index: linux-2.6/arch/x86/mm/numa_64.c
===================================================================
--- linux-2.6.orig/arch/x86/mm/numa_64.c
+++ linux-2.6/arch/x86/mm/numa_64.c
@@ -371,6 +371,12 @@ static void __init numa_reset_distance(v
{
size_t size;
+ if (!numa_distance_cnt) {
+ numa_distance = NULL;
+
+ return;
+ }
+
size = numa_distance_cnt * sizeof(numa_distance[0]);
memblock_x86_free_range(__pa(numa_distance),
__pa(numa_distance) + size);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists