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] pmem: fix a name collision
Date:   Thu, 30 Jun 2022 11:51:55 -0600
Message-Id: <20220630175155.3144222-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?HDU641/y6X81RUwOCBZa5FW40iM81LuCmA/WfGphYl00GaHKbprbAomPn836?=
 =?us-ascii?Q?20gAaO88Eec7GiEul/LxPuEZj2BgpUlnTp9zf8/C7oDT5Tyvm6DPPS/IXIaM?=
 =?us-ascii?Q?Lvi/S/qwvoJv7ohhLg5QHQP/81BQ9z75hFAdq8/35+pv7ABGf5yk/SAyDb9v?=
 =?us-ascii?Q?gS4uSVUBIU4yvkM3CmQYduQfSZbAVhNr63WWP6IGidMxRFH2wKbl1U6+1rsa?=
 =?us-ascii?Q?2SCCLHu5BL33X0aVEDqjEFw9E9vWcxpEHVqeCwIZQY4LD1BMlB41cc7pc6cE?=
 =?us-ascii?Q?aFWmARUn1trktJxxoUFZSMn5SsZavxlLF6jBnDvkOMg9eBSas0mb6T6zvV7U?=
 =?us-ascii?Q?/MWIjslhDmhu7EJGwlqPWSqwrO5peGAhnjl1iLTD6Qq53UpFcebBov149rvz?=
 =?us-ascii?Q?6VbfniQt5z45XUk/GxiY55PlEvTRtYJ0N0qe9BEjpUHiDAcBeFTnjNiv8q/o?=
 =?us-ascii?Q?6Fjm59/i5v4AaCsHSKRVlHjV0fuFT9ZtQ+9Hax+SeVFe5BXxh0EYJ8uL1dQj?=
 =?us-ascii?Q?bAAS+XtOaZc7xjtg7UKrWg+iS50XT6E4BSc75j562d5NHG+rhbv/H9gmibCl?=
 =?us-ascii?Q?6gHhY/gzD96tvcBsMrkrV+iAEaVEpVZHcg1z7hqvOqZuxkbJFoZzG/T/ckRH?=
 =?us-ascii?Q?h4G8azfog1zIWErDxhe1oGqoTWvdLRCRPziyQonky4dkH2eoXKgsMDICBVnA?=
 =?us-ascii?Q?LOh3QJA2T+TuCY3F5jZAdAfY5f5ovCD6TIG+iU/BXdLUZs2VpYN0E/jQUnSr?=
 =?us-ascii?Q?ZOsmBElNLUcQCUIn0xzkM2WUp7nOBRPobLBhxb6FlkxTdO2o+sMQvLmlCzrJ?=
 =?us-ascii?Q?ChBBHF8kDAnFUQgWqRhpR9gXpMGqR6b6jJ3LICBbxxi6zqu7x5fA9Vw0fljI?=
 =?us-ascii?Q?kZswF6hE3H7Z/bp0M11LTJMs2G1CmlvWzUim6mbxMDk9Ug9lTxu+kXX53Ah1?=
 =?us-ascii?Q?zGQHQwkZX6bBqsrTK5O34aMP2HWuMlQTB06dueRHdJG874vYwscWYOR/MWct?=
 =?us-ascii?Q?G4r+U8nDjmBEidbWf9fUj+lb2/SwnYLOij30Azo5ZVNllem73U0k5KtC6UOZ?=
 =?us-ascii?Q?X6AN3n1NiQwv13u5+27a82HKqbjhdk6XLwNv64HeGyR2ElmrKV0zljLgiEpj?=
 =?us-ascii?Q?OnQYDLshrKRfqW9wfA/eGHhWyo3jM2b4yAizPd3w3N82LGSr0pGBvztnplzT?=
 =?us-ascii?Q?bbfDo+t5azA8LTAsi8tmd6mwlNvOoAlc37HF6wDcNZWL00uTPTmLbN6RMpeN?=
 =?us-ascii?Q?vKdmrDSwh/ttaADkdoN4UGF/MfcPAQDjKALigEWMAymIj0UYrPj9MwIqFz1X?=
 =?us-ascii?Q?SenlL7CdH/eg1W13uhBiXaJtR2eU3qIv79ZwJll91iic+ad8OfhC4nHlgqRF?=
 =?us-ascii?Q?Diicc1P6TLa2Y4YlulASKig18ozInqiE8GfYnPoREbtHZMvwPiUiXbtkt1HJ?=
 =?us-ascii?Q?EGiBnYwcUKCWdTAWeWA7BBi/6bqYUXInpCt/LoLF63WCr2NaRgwOAieOc3F0?=
 =?us-ascii?Q?H96A72EkvCDIImppewNoGPjlUK2TG4MG31bPIDI6e4P/psy8TzQ7RNZO8unS?=
 =?us-ascii?Q?I14kZNYfWo4yA/6oGrGPfOuOl9CNHog7FWz70bJ7qx/HaglTOh/VYbzS8ed/?=
 =?us-ascii?Q?SA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 086a4cc3-aa54-4dcf-a25a-08da5ac14625
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4429.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 17:52:17.9968
 (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: eSLuTAR0fDjTI1fnkc8M1bipj40gXFgY/EQ4yM1S1iedei7vUmgO5B+q2Yaqm1UbGMawYQ8IgYKLcHyrbgViiQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3885
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 suspectscore=0 mlxscore=0 phishscore=0
 malwarescore=0 mlxlogscore=999 spamscore=0 adultscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000
 definitions=main-2206300070
X-Proofpoint-ORIG-GUID: mfm2e0aqI3yOdrOVm4bYl-Uhz6lrTJcy
X-Proofpoint-GUID: mfm2e0aqI3yOdrOVm4bYl-Uhz6lrTJcy
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 "_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..26c81ed7c0fe 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 _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 = _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 = _to_phys(pmem, offset);
 	long cleared = nvdimm_clear_poison(to_dev(pmem), phys, len);
 
 	if (cleared > 0) {
-- 
2.18.4