From patchwork Tue Jul 31 11:39:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 951557 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="QCICRL6F"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41fvcc6cjxz9s3N for ; Tue, 31 Jul 2018 21:40:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=vjg2J0fX7+4HRSj8iy9dmPIQG6GkjMfUNqKiYEKpBzk=; b=QCICRL6FUj/lmzIgm5410elSfK IGr7d33OsrCE/tlY+97YFAhZwjEejr43RBqoBtZ41kYFLZU1kXzB/741N9WkeayUUd8vBw21rJTaT 9CFQB8Qwf6OGJ9Y7v6+8lNQDoOBm6Qg7hv6Ofe0/ifpoXzpGsSoaga6nyz7b8mufrnp7WrcOTuDTx YsnBIQi6I4mcX3EGFBdDZweivX40+2VAW2ExC8MgxJ9MRjgcxJQv/2CdVRgB5t+PjPigUpomSSPSR 88Rm61F9m5KxXqgMLRRqj/CnsEj80BKj/84BZX7J2AHzViKmdQVAxQ2BlRFdCj8k3et6dXRx8Y2Kp Cvhy38ug==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkT0L-0001N2-Sa; Tue, 31 Jul 2018 11:39:53 +0000 Received: from 089144201224.atnat0010.highway.a1.net ([89.144.201.224] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkT0J-0001LG-Cy; Tue, 31 Jul 2018 11:39:51 +0000 From: Christoph Hellwig To: Masahiro Yamada Subject: [PATCH 04/10] kconfig: remove duplicate SWAP symbol defintions Date: Tue, 31 Jul 2018 13:39:29 +0200 Message-Id: <20180731113935.6105-5-hch@lst.de> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180731113935.6105-1-hch@lst.de> References: <20180731113935.6105-1-hch@lst.de> X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, Michal Simek , linux-kbuild@vger.kernel.org, Richard Weinberger , Randy Dunlap , linux-um@lists.infradead.org, linux-kernel@vger.kernel.org, Ley Foon Tan MIME-Version: 1.0 Sender: "linux-um" Errors-To: linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org microblaze and nios2 define their own always n SWAP symbols. Remove those and let the generic defintion do the right thing by adding a new symbol to disable swap entirely. Signed-off-by: Christoph Hellwig --- arch/microblaze/Kconfig | 4 +--- arch/nios2/Kconfig | 4 +--- init/Kconfig | 9 ++++++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index d14782100088..cc139d1b1284 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -1,5 +1,6 @@ config MICROBLAZE def_bool y + select ARCH_NO_SWAP select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_NO_COHERENT_DMA_MMAP if !MMU @@ -52,9 +53,6 @@ config CPU_LITTLE_ENDIAN endchoice -config SWAP - def_bool n - config RWSEM_GENERIC_SPINLOCK def_bool y diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig index 3d4ec88f1db1..3f9d4ef8b20f 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 config NIOS2 def_bool y + select ARCH_NO_SWAP select TIMER_OF select GENERIC_ATOMIC64 select GENERIC_CLOCKEVENTS @@ -38,9 +39,6 @@ config HAS_DMA config FPU def_bool n -config SWAP - def_bool n - config RWSEM_GENERIC_SPINLOCK def_bool y diff --git a/init/Kconfig b/init/Kconfig index 041f3a022122..1e69f93b809e 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -218,9 +218,16 @@ config DEFAULT_HOSTNAME but you may wish to use a different default here to make a minimal system more usable with less configuration. +# +# For some reason microblaze and nios2 hard code SWAP=n. Hopefully we can +# add proper SWAP support to them, in which case this can be remove. +# +config ARCH_NO_SWAP + bool + config SWAP bool "Support for paging of anonymous memory (swap)" - depends on MMU && BLOCK + depends on MMU && BLOCK && !ARCH_NO_SWAP default y help This option allows you to choose whether you want to have support