um: Replace to_phys() and to_virt() with less generic function names
authorGuenter Roeck <linux@roeck-us.net>
Thu, 14 Jul 2022 18:46:00 +0000 (11:46 -0700)
committerRichard Weinberger <richard@nod.at>
Sun, 17 Jul 2022 21:44:40 +0000 (23:44 +0200)
commit8970d5c9f4a95db6efa9158814b953bfa0bf1f5b
treea8498b65ea10aba2c0519ad15c63e13dde3c5dfb
parent637285e7f8d6da70a70c64e7895cb0672357a1f7
um: Replace to_phys() and to_virt() with less generic function names

to_virt() and to_phys() are very generic and may be defined by drivers.
As it turns out, commit 9409c9b6709e ("pmem: refactor pmem_clear_poison()")
did exactly that. This results in build errors such as the following
when trying to build um:allmodconfig.

drivers/nvdimm/pmem.c: In function ‘pmem_dax_zero_page_range’:
./arch/um/include/asm/page.h:105:20: error:
too few arguments to function ‘to_phys’
  105 | #define __pa(virt) to_phys((void *) (unsigned long) (virt))
      |                    ^~~~~~~

Use less generic function names for the um specific to_phys() and to_virt()
functions to fix the problem and to avoid similar problems in the future.

Fixes: 9409c9b6709e ("pmem: refactor pmem_clear_poison()")
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
arch/um/include/asm/page.h
arch/um/include/shared/mem.h
arch/um/os-Linux/skas/process.c