Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp370511ybh; Wed, 22 Jul 2020 02:46:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAVnlpCapljmu5W8/RB/6hmTpWAf/t2uXDV1ccL2mOXAXLNX4n8aoTIVagoa7u4mS9cKN2 X-Received: by 2002:a17:906:1394:: with SMTP id f20mr261539ejc.114.1595411217684; Wed, 22 Jul 2020 02:46:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595411217; cv=none; d=google.com; s=arc-20160816; b=E2C8TSvFGmjNjFAU/mYicAwl2pfVdTFCh1KXimdSwACsbR9NcXTllWB/M+1oJKx41t NQ2rbXVCfAftM3JhkD2u10BTmynmhaFR/cBKOnZWjOtsR+kTDrg9mWOifSmgH2ralfBt zCYh9UnFsbj/02U/BxyNXh2Y0CkNjqT5TP5I76k9G8j/9MUl/0YIzyPAXvVftalIaxoG PmnAnsOA5lKRZH6Vqd+7QA6d/utDvFStXsVhVCmkDlHLpa6z3A0kJ+usIAlUScpNRaTQ Q9+Dlg9JLRD9LzKAXOspPhK48A+ww0Srq+GtxclVgAHoIBowZQpAEn6btpRfbM3QT6wB tqow== 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=JjwS/JLb1s3JDMPWgSTtbcGvD6D7buhvjNgTLIOzWvPqyo5uF3q6POsrhi5Dry9qCI Y7h/dIwLjjL8CfY0JLL9kH0DOXey84KHbefY77XcaNgL0FT+JsaRS6Dfnlr2CnEXA73i c0ypCJU8uY++ZeBMuSNR4thPv4OEv7Q6J43gfJKOWYBfFXmLb8EShh5WgXx0vZC2AW5s vXy3Dgx9NOwnfm8PzKgUDk+I0kCVZi9nrig7WQixuEtt4BW/E7meiHpUIH2898eTul9u 7mt3q8gfaOCt/UPGQ6rkrwtiTMkEdf/rJ3DqG6mSaWFip9B4qADpR6x/RF94Z2F7qPzU kujw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Lz5o69d3; 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 t24si13956000ejr.733.2020.07.22.02.46.35; Wed, 22 Jul 2020 02:46:57 -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=Lz5o69d3; 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 S1731629AbgGVJqP (ORCPT + 99 others); Wed, 22 Jul 2020 05:46:15 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:49367 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731610AbgGVJqO (ORCPT ); Wed, 22 Jul 2020 05:46:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595411173; 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=Lz5o69d3lMKR+0DQqL+vKZjWm/ViqI3gca6fhJpWSf/rhwwqvr6Y0rJ1qkh2OpOSDUilEf BzOaveSZMlMbFNEGaghaEp8xPUL3yV/7NrL3XQ/2QnaPIIxfsoZo0UoqiIZKGnIV70vM4Y /vgbUujMCf/gnw0KpxWDaRYdh77djIo= 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-144-Tp74bpWWMNeI9H_3pCcviw-1; Wed, 22 Jul 2020 05:46:09 -0400 X-MC-Unique: Tp74bpWWMNeI9H_3pCcviw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6108C100CCC1; Wed, 22 Jul 2020 09:46:08 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-254.ams2.redhat.com [10.36.113.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D4195D9CA; Wed, 22 Jul 2020 09:46:04 +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 v2 1/9] s390/vmem: rename vmem_add_mem() to vmem_add_range() Date: Wed, 22 Jul 2020 11:45:50 +0200 Message-Id: <20200722094558.9828-2-david@redhat.com> In-Reply-To: <20200722094558.9828-1-david@redhat.com> References: <20200722094558.9828-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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