From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752656AbaAMTW7 (ORCPT ); Mon, 13 Jan 2014 14:22:59 -0500 Received: from mga01.intel.com ([192.55.52.88]:43446 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752252AbaAMTWy (ORCPT ); Mon, 13 Jan 2014 14:22:54 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,654,1384329600"; d="scan'208";a="464459367" Subject: [PATCH 07/12] x86 Kconfig: move memtest To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, Dave Hansen From: Dave Hansen Date: Mon, 13 Jan 2014 11:22:54 -0800 References: <20140113192245.3F682C7F@viggo.jf.intel.com> In-Reply-To: <20140113192245.3F682C7F@viggo.jf.intel.com> Message-Id: <20140113192254.F574139F@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen Move the "Memtest" option over to the "Memory Debugging" menu. The code is not x86 specific at all, but it still resides in arch/x86, so keep the x86 dependency. Signed-off-by: Dave Hansen --- linux.git-davehans/arch/x86/Kconfig | 11 ----------- linux.git-davehans/mm/Kconfig.debug | 12 ++++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff -puN arch/x86/Kconfig~move-memtest arch/x86/Kconfig --- linux.git/arch/x86/Kconfig~move-memtest 2014-01-13 11:11:35.761217154 -0800 +++ linux.git-davehans/arch/x86/Kconfig 2014-01-13 11:11:35.764217289 -0800 @@ -1045,17 +1045,6 @@ endif #HYPERVISOR_GUEST config NO_BOOTMEM def_bool y -config MEMTEST - bool "Memtest" - ---help--- - This option adds a kernel parameter 'memtest', which allows memtest - to be set. - memtest=0, mean disabled; -- default - memtest=1, mean do 1 test pattern; - ... - memtest=4, mean do 4 test patterns. - If you are unsure how to answer this question, answer N. - config X86_SUMMIT_NUMA def_bool y depends on X86_32 && NUMA && X86_32_NON_STANDARD diff -puN mm/Kconfig.debug~move-memtest mm/Kconfig.debug --- linux.git/mm/Kconfig.debug~move-memtest 2014-01-13 11:11:35.762217199 -0800 +++ linux.git-davehans/mm/Kconfig.debug 2014-01-13 11:11:35.765217335 -0800 @@ -1,3 +1,15 @@ +config MEMTEST + bool "Memtest" + depends on X86 + ---help--- + This option adds a kernel parameter 'memtest', which allows memtest + to be set. + memtest=0, mean disabled; -- default + memtest=1, mean do 1 test pattern; + ... + memtest=4, mean do 4 test patterns. + If you are unsure how to answer this question, answer N. + config DEBUG_PAGEALLOC bool "Debug page memory allocations" depends on DEBUG_KERNEL _