Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jane Chu <jane.chu@oracle.com>
To:     dan.j.williams@intel.com, linux-kernel@vger.kernel.org, hch@lst.de,
        nvdimm@lists.linux.dev
Subject: [PATCH v2] pmem: fix a name collision
Date:   Thu, 30 Jun 2022 12:28:02 -0600
Message-Id: <20220630182802.3250449-1-jane.chu@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RcXkE6JjO/uVi2JdK4EdUSKMrIp3J5YWzOPbWSoN6K0gE/tCqaptIGpBfmXm?=
 =?us-ascii?Q?TzuTYbSSv+EUHUOmDrMc/oOBayORReiXx0LRwZMGNKsP46cockrNunOj8ynG?=
 =?us-ascii?Q?z72akJhFnTX/0vds3IqYMZoao7ZuQ+zrv+USA/d65mvLdcPhClhzUyO7ZiKA?=
 =?us-ascii?Q?6WOSeOzBaCuAfeZABki6FJtnHwxxpypEHZZCtOrbqtVNT16G2bTd+ToZmTh2?=
 =?us-ascii?Q?WaL5laZvakgX75Hj60hkWTwo+NMZ9hwKzIpJ/xXQgsctdtChXyz9jpk8Z8Fy?=
 =?us-ascii?Q?hyFROl7ZBr/PWtED1igaRKXRmH3MfGsEY5KfRbhk2oBrVJ76+gEMy/9zBaod?=
 =?us-ascii?Q?tQS593gP33sW7fEzV+bF9zEub+QUwNrKnwFLxw6+jmOrAtya7WxyvlZZ3+eH?=
 =?us-ascii?Q?UPp8CJG4SEZWvZoiHP1YNYaE4lZNbRJzcOaWerQpFuEIu5GHMZ5luvKrQhWz?=
 =?us-ascii?Q?agyyS7jMRyPHs0K5LuUspesrXyGTlw1c1aMwSMUsHsdF75BhTjBamBawXwRh?=
 =?us-ascii?Q?FSP2gUsjwHhRhUsZ63X8rql9r89dtxbp5AJ5x4VtDvhYnr7T7ajzdQnm2MQu?=
 =?us-ascii?Q?JnLK1lJWcMWuPUMsU1kqJPF+88Ghdc2RqVphqc+Eb4Kefo02HMIxeD6qRUl3?=
 =?us-ascii?Q?dkEaTSauWUcfsvXbKXBhzvdFCtrdFcLFdCGkx9i2nO0MYFvxZHLH5UTyxaw3?=
 =?us-ascii?Q?7rL16zKglOUUmLZGXnJ65XAIbsKsPWqkFrmbKE0Sgr5iTCk/RjxH48ss1qtH?=
 =?us-ascii?Q?5sKwZLY2trcaLqG6WIFcpQMZpKWTmO44tHYpWe++BRzXBnl1xxbsB7m4fIfP?=
 =?us-ascii?Q?XOVTi0FMb1uOJHeDRqx3o9gHmJFO1MERNZQ+H8QloVrvzRdG+mgx/zHeMY7Q?=
 =?us-ascii?Q?RchlcUkydf7haGIfDvtm8x+aTFtFiQkniDxhxTaUyDr3Ev1LaAieyJY36sqO?=
 =?us-ascii?Q?ZdGL4ZvrIUuZDYqsQKi18B1TAxXUhC4s70vObnP40E2A5DBXmfKAYh86kHaz?=
 =?us-ascii?Q?80EmvIUne/643X22F4p4OUARyy3PFByEYX90LJmSlshW+EpwYjjnHhROQb2E?=
 =?us-ascii?Q?7USLEPXbs0FlZjD56t4PFzKNW7dAd4veicgQIa7CgAtm8UOzz/kUiHZebxov?=
 =?us-ascii?Q?PpykPZGL57+Zvzc2R7JvQjMMRud67FOGNW5iIDsoq+KhhGMLWsek+gZ857eA?=
 =?us-ascii?Q?FnS2M1PdEoxsbE67EZUc7qF7fd2uCDUd/H5EUYM7l/PXdLDziUh8JQ/2fQh8?=
 =?us-ascii?Q?YRBRH2vk/vW87r+0EcIlYeVrdl5NZw8MdJgMA5cq+S6mEgiMwXl4hOH3kE8Z?=
 =?us-ascii?Q?/np8rj4pT23fpRf5iAvyXLfqstsQtg2NaT70HXXJsNqc8hESUouer+AoPtZ4?=
 =?us-ascii?Q?jUjyCGfiLoRgFFh2k7tysFLjTAmv0ftvxA09s7isZFHWQuLkXTNPjz3j7ZH7?=
 =?us-ascii?Q?EaW3gk0FosKtfkqKkAlWiiFnWOXXj8jNyH8sqTOyrPTtJpYDSpoWD/Fd80p8?=
 =?us-ascii?Q?pAYdRe+XTvM1AJtyiSwty2Ngce/eXmmk4RL0lebRTM8Ki+8CZHASbw36B8MV?=
 =?us-ascii?Q?ThEjpFfGba0g00BF2ua34rj0lBYFzY3yOAz+h4TbwSnwc9K3Q0qrmAruOre6?=
 =?us-ascii?Q?3A=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e3e0f453-496e-4a19-4915-08da5ac64ded
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4429.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 18:28:18.5329
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 1NM8eYYk5h/LmX5RQV4dgeee3YN6Hj1zKhdP/FzaIcovY8TuSoQeqotuuIRQM2qkknN1IeZzPv6E5ebs9Dm1uQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4783
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-06-30_12:2022-06-28,2022-06-30 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0
 phishscore=0 adultscore=0 malwarescore=0 bulkscore=0 spamscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2204290000 definitions=main-2206300071
X-Proofpoint-ORIG-GUID: 3CYGxftrNUuZyuXSd17A6K6LbczDWgTG
X-Proofpoint-GUID: 3CYGxftrNUuZyuXSd17A6K6LbczDWgTG
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Kernel test robot detected name collision when compiled on 'um'
architecture.  Rename "to_phys()"  to "pmem_to_phys()".

>> drivers/nvdimm/pmem.c:48:20: error: conflicting types for 'to_phys'; have 'phys_addr_t(struct pmem_device *, phys_addr_t)' {aka 'long long unsigned int(struct pmem_device *, long long unsigned int)'}
      48 | static phys_addr_t to_phys(struct pmem_device *pmem, phys_addr_t offset)
         |                    ^~~~~~~
   In file included from arch/um/include/asm/page.h:98,
                    from arch/um/include/asm/thread_info.h:15,
                    from include/linux/thread_info.h:60,
                    from include/asm-generic/preempt.h:5,
                    from ./arch/um/include/generated/asm/preempt.h:1,

   arch/um/include/shared/mem.h:12:29: note: previous definition of 'to_phys' with type 'long unsigned int(void *)'
      12 | static inline unsigned long to_phys(void *virt)
         |                             ^~~~~~~

vim +48 drivers/nvdimm/pmem.c
    47
  > 48	static phys_addr_t to_phys(struct pmem_device *pmem, phys_addr_t offset)
    49	{
    50		return pmem->phys_addr + offset;
    51	}
    52

Fixes: 9409c9b6709e (pmem: refactor pmem_clear_poison())
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Jane Chu <jane.chu@oracle.com>
---
 drivers/nvdimm/pmem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 629d10fcf53b..b9f1a8e9f88c 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -45,7 +45,7 @@ static struct nd_region *to_region(struct pmem_device *pmem)
 	return to_nd_region(to_dev(pmem)->parent);
 }
 
-static phys_addr_t to_phys(struct pmem_device *pmem, phys_addr_t offset)
+static phys_addr_t pmem_to_phys(struct pmem_device *pmem, phys_addr_t offset)
 {
 	return pmem->phys_addr + offset;
 }
@@ -63,7 +63,7 @@ static phys_addr_t to_offset(struct pmem_device *pmem, sector_t sector)
 static void pmem_mkpage_present(struct pmem_device *pmem, phys_addr_t offset,
 		unsigned int len)
 {
-	phys_addr_t phys = to_phys(pmem, offset);
+	phys_addr_t phys = pmem_to_phys(pmem, offset);
 	unsigned long pfn_start, pfn_end, pfn;
 
 	/* only pmem in the linear map supports HWPoison */
@@ -97,7 +97,7 @@ static void pmem_clear_bb(struct pmem_device *pmem, sector_t sector, long blks)
 static long __pmem_clear_poison(struct pmem_device *pmem,
 		phys_addr_t offset, unsigned int len)
 {
-	phys_addr_t phys = to_phys(pmem, offset);
+	phys_addr_t phys = pmem_to_phys(pmem, offset);
 	long cleared = nvdimm_clear_poison(to_dev(pmem), phys, len);
 
 	if (cleared > 0) {
-- 
2.18.4