Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

Pull m68k updates from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Provide __phys_to_pfn() and __pfn_to_phys()
  m68k/atari, m68k/sun3: Fix SCSI platform device registration when driver is modular
  m68k/defconfig: Update defconfigs for v4.4-rc1
  m68k/mac: Kill psc_present

diff --combined arch/m68k/sun3/config.c
index 2a5f43a68ae3d73d22dd822a4da4996208543e7c,3f06a5d01fbc21baf4b3743215a2b8688872e933..71884bf01d7200e6f77dc3d27731c1b6e97b9081
--- 1/arch/m68k/sun3/config.c
--- 2/arch/m68k/sun3/config.c
+++ b/arch/m68k/sun3/config.c
@@@ -118,13 -118,13 +118,13 @@@ static void __init sun3_bootmem_alloc(u
        memory_end = memory_end & PAGE_MASK;
  
        start_page = __pa(memory_start) >> PAGE_SHIFT;
 -      num_pages = __pa(memory_end) >> PAGE_SHIFT;
 +      max_pfn = num_pages = __pa(memory_end) >> PAGE_SHIFT;
  
        high_memory = (void *)memory_end;
        availmem = memory_start;
  
        m68k_setup_node(0);
 -      availmem += init_bootmem_node(NODE_DATA(0), start_page, 0, num_pages);
 +      availmem += init_bootmem(start_page, num_pages);
        availmem = (availmem + (PAGE_SIZE-1)) & PAGE_MASK;
  
        free_bootmem(__pa(availmem), memory_end - (availmem));
@@@ -171,7 -171,7 +171,7 @@@ static void __init sun3_sched_init(irq_
          intersil_clear();
  }
  
- #ifdef CONFIG_SUN3_SCSI
+ #if IS_ENABLED(CONFIG_SUN3_SCSI)
  
  static const struct resource sun3_scsi_vme_rsrc[] __initconst = {
        {