From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932291AbbHGOIo (ORCPT <rfc822;w@1wt.eu>);
	Fri, 7 Aug 2015 10:08:44 -0400
Received: from mga11.intel.com ([192.55.52.93]:58379 "EHLO mga11.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S932093AbbHGOIn (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 7 Aug 2015 10:08:43 -0400
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.15,630,1432623600"; 
   d="scan'208";a="537772007"
Message-ID: <1438956522.17630.1.camel@linux.intel.com>
Subject: Re: [PATCH 2/6] x86: clean up conditional pmem includes
From: Ross Zwisler <ross.zwisler@linux.intel.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: linux-kernel@vger.kernel.org, linux-nvdimm@ml01.01.org,
        dan.j.williams@intel.com, Juergen Gross <jgross@suse.com>,
        x86@kernel.org, Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>, Borislav Petkov <bp@suse.de>,
        Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 07 Aug 2015 08:08:42 -0600
In-Reply-To: <20150807063916.GB11543@infradead.org>
References: <1438883000-9011-1-git-send-email-ross.zwisler@linux.intel.com>
	 <1438883000-9011-3-git-send-email-ross.zwisler@linux.intel.com>
	 <20150807063916.GB11543@infradead.org>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.12.11 (3.12.11-1.fc21) 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, 2015-08-06 at 23:39 -0700, Christoph Hellwig wrote:
> On Thu, Aug 06, 2015 at 11:43:16AM -0600, Ross Zwisler wrote:
> > Prior to this change x86_64 used the pmem defines in
> > arch/x86/include/asm/cacheflush.h, and UM used the default ones at the
> > top of include/linux/pmem.h.  The inclusion or exclusion in pmem.h was
> > controlled by CONFIG_ARCH_HAS_PMEM_API, but the ones in cacheflush.h
> > were controlled by ARCH_HAS_NOCACHE_UACCESS.
> > 
> > Instead, control them both with CONFIG_ARCH_HAS_PMEM_API so that it's
> > clear that they are related and we don't run into the possibility where
> > they are both included or excluded.  Also remove a bunch of stale
> > function prototypes meant for UM in cacheflush.h - these just conflicted
> > with the inline defaults in pmem.h, and gave compile errors:
> 
> This looks reasonable, but can you use the opportunity to also move
> the pmem arch inlines from asm/cacheflush.h to a new asm/pmem.h?

Sure, it that seems like a good idea.  Thanks.