From patchwork Fri Nov 30 17:59:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 10706967 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A28EB13B0 for ; Fri, 30 Nov 2018 18:00:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 908EF2FF6F for ; Fri, 30 Nov 2018 18:00:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8465F2FF86; Fri, 30 Nov 2018 18:00:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 043702FF6F for ; Fri, 30 Nov 2018 18:00:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7BD3A6B597D; Fri, 30 Nov 2018 13:00:41 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 793206B597E; Fri, 30 Nov 2018 13:00:41 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65A896B597F; Fri, 30 Nov 2018 13:00:41 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by kanga.kvack.org (Postfix) with ESMTP id 3A2A86B597D for ; Fri, 30 Nov 2018 13:00:41 -0500 (EST) Received: by mail-qk1-f200.google.com with SMTP id y83so6001294qka.7 for ; Fri, 30 Nov 2018 10:00:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=+6DSR1HTc51AcSoaV6DRzZ5L0RhPVEyXeNTwSvUeYxE=; b=laW5GpzW1rNG4ZF+IkPi6z3KyFP2uCBRgk1zzu/2TP3dUwbijFJziWOzcga+0vhUOi KUCkziO/nB3zK31d61s5GopRVRJtlzR9xa0JW1QZpUeMcpfzQLQvctnuZkHymhcsRovH m8Ipyhnl7y8awhijFBFjeHEBWtpQ4wjgj2m6X0d6M7m2YTXoi3AqHoOuuQlLa94i6y01 URsShJD3NXLpQ5Uwq+xF6I432O4L4PBc56Z7TM9cKq44TZ1gxpm3P2gD+x5qcPjTyhMD eISKftIOSPf1Fr3kfD7k5NSQg5cvbo/yXqQRi9iqyIGaf6hg9wJRF5nxPRvptg2mWqVj /YIg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: AA+aEWY7bdCJRJGyVBqOmimNquSOZqIxA3jv3j0EHwR6id0IiLsYx/kq y+XtIbaDsUGGg0H5Q0btyN+PiuJRBRWacrx+H5w9RRDbpfcpq5gJth2VggtmNGAfnv6CIBqtZXy zdVG+cDCeets+RI365tyA9w4M0qASSW+nclxa/N/nlte31lT/TAK8hN5s+ywYOAAmmQ== X-Received: by 2002:ac8:33b6:: with SMTP id c51mr6416315qtb.190.1543600840943; Fri, 30 Nov 2018 10:00:40 -0800 (PST) X-Google-Smtp-Source: AFSGD/WmdctzHB91MQ3I/R71SGXYjkIZxZTMqBrT/fIlXzrDsy62Se3ib97Ps2DZSh8I+NRnTzt9 X-Received: by 2002:ac8:33b6:: with SMTP id c51mr6416207qtb.190.1543600839324; Fri, 30 Nov 2018 10:00:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543600839; cv=none; d=google.com; s=arc-20160816; b=U496o00L/fR3A/rJ7+bp3dPlgqyCB/wGrBxAERkldsSXNUi5kAIzI99LyB66XhrnT/ ODJReyOSb7kfBd6s4RRLkJSzvxQSIBD/XHhdmiJgimG40ZKkW/Uen5SU09F8mpTFP7Ha upSJ5GO66stRIN6ekpjK6nUY7227thjZxd+qgMrAv86h0sy+Pr1qEaUOdDJLbH1SGVJs bVc9dmWw6kqbrl7Ig4HxOeFbZvT/Q+2N25W+7JjmCF+pCq1QZLVkgpDbydqDuOZR6++0 DqvCRI7ehvjhnUgx0rlP2zIh7flnnPpuRNZ+9i7QMgkrkrs+DCK5fmUuINJVlZhU8a+C FN8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=+6DSR1HTc51AcSoaV6DRzZ5L0RhPVEyXeNTwSvUeYxE=; b=ieIqMI868W8kAT8A9VDp195ji2fkY4pyHGAha8UiNpbScp2TeqFUywj9zOA4kUB5DH CIvye9n6jFL0LGUGpKlixAWWo7/Da81fOjpi8eAmPUsjKyb6TV6OkMGIjgumisM60BBd eDidKwtqmVNwwlQFzSZUiV3NkjOKQm3k6jnOGfs+M6yuJuOs29mN5McGEoPX49G14lzr 6F1pU9iiQPjlOyXNHMetKjR6Voxew8jRy2fVOHPHWOtnmHERgLP83LkMEVecJBzsYkH/ NYoDvQNDNFNPzxDqW0tAOW1rYNr4Pt0mzyoG2wna8Qd4eVy2BuBFtHwGQphR33w10YSt wHfw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id 31si1067894qvp.175.2018.11.30.10.00.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Nov 2018 10:00:39 -0800 (PST) Received-SPF: pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 mx1.redhat.com (Postfix) with ESMTPS id CFEBD307D982; Fri, 30 Nov 2018 18:00:37 +0000 (UTC) Received: from t460s.redhat.com (ovpn-126-156.rdu2.redhat.com [10.10.126.156]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26FAB6870A; Fri, 30 Nov 2018 18:00:30 +0000 (UTC) From: David Hildenbrand To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-acpi@vger.kernel.org, devel@linuxdriverproject.org, xen-devel@lists.xenproject.org, x86@kernel.org, David Hildenbrand , Greg Kroah-Hartman , "Rafael J. Wysocki" , Andrew Morton , Ingo Molnar , Pavel Tatashin , Stephen Rothwell , Andrew Banman , "mike.travis@hpe.com" , Oscar Salvador , Dave Hansen , Michal Hocko , =?utf-8?q?Michal_Such=C3=A1nek?= , Vitaly Kuznetsov , Dan Williams , Pavel Tatashin Subject: [PATCH RFCv2 4/4] mm/memory_hotplug: Drop MEMORY_TYPE_UNSPECIFIED Date: Fri, 30 Nov 2018 18:59:22 +0100 Message-Id: <20181130175922.10425-5-david@redhat.com> In-Reply-To: <20181130175922.10425-1-david@redhat.com> References: <20181130175922.10425-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 30 Nov 2018 18:00:38 +0000 (UTC) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP We now have proper types for all users, we can drop this one. Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Cc: Andrew Morton Cc: Ingo Molnar Cc: Pavel Tatashin Cc: Stephen Rothwell Cc: Andrew Banman Cc: "mike.travis@hpe.com" Cc: Oscar Salvador Cc: Dave Hansen Cc: Michal Hocko Cc: Michal Suchánek Cc: Vitaly Kuznetsov Cc: Dan Williams Cc: Pavel Tatashin Signed-off-by: David Hildenbrand --- drivers/base/memory.c | 3 --- include/linux/memory.h | 5 ----- 2 files changed, 8 deletions(-) diff --git a/drivers/base/memory.c b/drivers/base/memory.c index c5fdca7a3009..a6e524f0ea38 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -388,9 +388,6 @@ static ssize_t type_show(struct device *dev, struct device_attribute *attr, ssize_t len = 0; switch (mem->type) { - case MEMORY_BLOCK_UNSPECIFIED: - len = sprintf(buf, "unspecified\n"); - break; case MEMORY_BLOCK_BOOT: len = sprintf(buf, "boot\n"); break; diff --git a/include/linux/memory.h b/include/linux/memory.h index a3a1e9764805..11679622f743 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h @@ -50,10 +50,6 @@ int set_memory_block_size_order(unsigned int order); * No memory block is to be created (e.g. device memory). Not exposed to * user space. * - * MEMORY_BLOCK_UNSPECIFIED: - * The type of memory block was not further specified when adding the - * memory block. - * * MEMORY_BLOCK_BOOT: * This memory block was added during boot by the basic system. No * specific device driver takes care of this memory block. This memory @@ -103,7 +99,6 @@ int set_memory_block_size_order(unsigned int order); */ enum { MEMORY_BLOCK_NONE = 0, - MEMORY_BLOCK_UNSPECIFIED, MEMORY_BLOCK_BOOT, MEMORY_BLOCK_DIMM, MEMORY_BLOCK_DIMM_UNREMOVABLE,