]> git.ipfire.org Git - people/ms/linux.git/commit
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)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 14 Jul 2022 18:57:27 +0000 (11:57 -0700)
commit097da1a44d1aef15739214fecf8f4c63792bb665
tree5ee789d67802eba5580688df2cbd3e297e654829
parentc4634a3c7dcabed7321304efc00b5a81559adeca
um: Replace to_phys() and to_virt() with less generic function names

The UML function names to_virt() and to_phys() are exposed by UML
headers, and 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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/um/include/asm/page.h
arch/um/include/shared/mem.h
arch/um/os-Linux/skas/process.c