Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp2330754ybt; Fri, 3 Jul 2020 06:40:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/Q+p0jju25QcWaAp1c91N/6yFQmobgQ2QZZFFnT4pDDwr70m8qByxRJT7QeAUdxAYitXm X-Received: by 2002:a17:906:d78f:: with SMTP id pj15mr34034922ejb.283.1593783613319; Fri, 03 Jul 2020 06:40:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593783613; cv=none; d=google.com; s=arc-20160816; b=VkFPLRcSubYCN2pQ4WhF3mA/MRusnoVIMVJVHqrjFTYkSeWRF5xchKo6qQb58tI9zP yhKq7ayVh8PesNYvDR6BpBUJ+St4P9weRVBfF4488DUunpQdOEiVXA8WnNqsboWG4Gqr gJUKTJqarvHqxo0RKHJDuydE/jvXHFcZHZAXBbugBiCFJo5meiX7YySaqPMwqqsPe/2s 4TH6HuVgZlL4elow5x8NZ4f4t/rHG3WQkAK/X/rcojxIF6sQviS1Qzw/qMvvq0qX+u/q hzU23HsdYliuziinx9HC3A4SJWCKUme89higiscHiNphZUo2pvYFugNQA2r09hUF8sFX Bqew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yWLTZ0ohTCOqY8W0BivI+pv17MHIbXm1Wg5QczAEU30=; b=T51Sw85K2nUD2znBlXqSO788ncbZOmUod3PqZpdOKenj9HM8//23Tz79BwRy+0BjDy QWgdCg+KQjVTiQ3zfXtkuusqBwhx0R5fYDnppl3dzgeoHOjMp/WVgudAMLOIvZVKsQtz ZPSO1kcElj9PzL1PKUKxrLaCy45P7d7bCeUHAUnWKjB7Mj0L102nTetjKbc0fCc62+CQ JzVNbETjSolK0IBLT3sxexaIW2XJnpaVm+q70TSgXaly9G23HvpmP7rNUPB7bycQXqRi NTMwn9rk7ZaxYHUzT7ZZuy6c2Hi0BFGHCs4ZVB0Mjm1DLKjFw+0sf5vrkkof6NsSlAsW Kf8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UJVDr8xB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g7si7546258ejr.748.2020.07.03.06.39.50; Fri, 03 Jul 2020 06:40:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UJVDr8xB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726479AbgGCNje (ORCPT + 99 others); Fri, 3 Jul 2020 09:39:34 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:25983 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726416AbgGCNjb (ORCPT ); Fri, 3 Jul 2020 09:39:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593783570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yWLTZ0ohTCOqY8W0BivI+pv17MHIbXm1Wg5QczAEU30=; b=UJVDr8xBE5Z9I7LQbxHqHwch/OV7LPbhi/IcOSBMv55Y/UyzE3Ef+VYktu5kR7WbkyI7Io OgOfSJI9FRlkBk0sJMK1QIrf7ENh2oJ0doEjwQUXIdamiIY/Em/BF2yoQjTKBDMe67m+9H rvbzBtjS37F+2tGDyyApMlnl6Hs3Zbk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-181-HN_JwzWiNtmJnbIccLMHJw-1; Fri, 03 Jul 2020 09:39:26 -0400 X-MC-Unique: HN_JwzWiNtmJnbIccLMHJw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7E99C1902EA8; Fri, 3 Jul 2020 13:39:24 +0000 (UTC) Received: from t480s.redhat.com (ovpn-114-0.ams2.redhat.com [10.36.114.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id E07B67AC7D; Fri, 3 Jul 2020 13:39:22 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-s390@vger.kernel.org, linux-mm@kvack.org, David Hildenbrand , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Gerald Schaefer Subject: [PATCH v1 1/9] s390/vmem: rename vmem_add_mem() to vmem_add_range() Date: Fri, 3 Jul 2020 15:39:09 +0200 Message-Id: <20200703133917.39045-2-david@redhat.com> In-Reply-To: <20200703133917.39045-1-david@redhat.com> References: <20200703133917.39045-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Let's match the name to vmem_remove_range(). Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Christian Borntraeger Cc: Gerald Schaefer Signed-off-by: David Hildenbrand --- arch/s390/mm/vmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index 3b9e71654c37b..66c5333020ead 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c @@ -57,7 +57,7 @@ pte_t __ref *vmem_pte_alloc(void) /* * Add a physical memory range to the 1:1 mapping. */ -static int vmem_add_mem(unsigned long start, unsigned long size) +static int vmem_add_range(unsigned long start, unsigned long size) { unsigned long pgt_prot, sgt_prot, r3_prot; unsigned long pages4k, pages1m, pages2g; @@ -308,7 +308,7 @@ int vmem_add_mapping(unsigned long start, unsigned long size) return -ERANGE; mutex_lock(&vmem_mutex); - ret = vmem_add_mem(start, size); + ret = vmem_add_range(start, size); if (ret) vmem_remove_range(start, size); mutex_unlock(&vmem_mutex); @@ -325,7 +325,7 @@ void __init vmem_map_init(void) struct memblock_region *reg; for_each_memblock(memory, reg) - vmem_add_mem(reg->base, reg->size); + vmem_add_range(reg->base, reg->size); __set_memory((unsigned long)_stext, (unsigned long)(_etext - _stext) >> PAGE_SHIFT, SET_MEMORY_RO | SET_MEMORY_X); -- 2.26.2