From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752351Ab0CTGkF (ORCPT ); Sat, 20 Mar 2010 02:40:05 -0400 Received: from hera.kernel.org ([140.211.167.34]:56012 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751868Ab0CTGkD (ORCPT ); Sat, 20 Mar 2010 02:40:03 -0400 Message-ID: <4BA46D66.3050306@kernel.org> Date: Fri, 19 Mar 2010 23:38:30 -0700 From: Yinghai Lu User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.8) Gecko/20100228 SUSE/3.0.3-1.1.1 Thunderbird/3.0.3 MIME-Version: 1.0 To: Linus Torvalds CC: "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , linux-kernel@vger.kernel.org, Ian Campbell , Peter Zijlstra Subject: [PATCH -v6] x86: do not free zero sized per cpu areas References: <4B914A61.20409@kernel.org> <4BA3F82D.5090807@kernel.org> <4BA3F8ED.2090600@zytor.com> <4BA407B8.7070503@kernel.org> <4BA408EE.5000001@zytor.com> <4BA40C83.1030202@kernel.org> <4BA42C05.3060800@kernel.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ian Campbell This avoids an infinite loop in free_early_partial(). Add a warning to free_early_partial to catch future problems. -v5: put back start > end back into WARN_ONCE() -v6: use one line for if according to linus Signed-off-by: Ian Campbell Signed-off-by: Yinghai Lu Cc: Peter Zijlstra Cc: Ingo Molnar --- kernel/early_res.c | 6 ++++++ 1 file changed, 6 insertions(+) Index: linux-2.6/kernel/early_res.c =================================================================== --- linux-2.6.orig/kernel/early_res.c +++ linux-2.6/kernel/early_res.c @@ -333,6 +333,12 @@ void __init free_early_partial(u64 start struct early_res *r; int i; + if (start == end) + return; + + if (WARN_ONCE(start > end, "free_early_partial: wrong range [%#llx, %#llx]\n", start, end)) + return; + try_next: i = find_overlapped_early(start, end); if (i >= max_early_res)