svn commit: r331971 - stable/11/sys/arm/include

[Michal Meloun]

Author: mmel
Date: Wed Apr  4 02:17:26 2018
New Revision: 331971
URL: https://svnweb.freebsd.org/changeset/base/331971

Log:
  MFC r309531,r309553,r309604:
  
    r309531:
      Implement fake pmap_mapdev_attr() for ARMv6.  This function is referenced,
      but never called from DRM2 code. Also, real behavior of pmap_mapdev_attr()
      in ARM world is unclear as we don't have any additional attribute for a
      device memory type.
    r309553:
      Fix build breakage caused by r309531.
    r309604:
      Fix the armv6 build after r309553.

Modified:
  stable/11/sys/arm/include/pmap-v6.h
  stable/11/sys/arm/include/pmap.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/include/pmap-v6.h
==============================================================================
--- stable/11/sys/arm/include/pmap-v6.h	Wed Apr  4 02:13:27 2018	(r331970)
+++ stable/11/sys/arm/include/pmap-v6.h	Wed Apr  4 02:17:26 2018	(r331971)
@@ -166,7 +166,6 @@ extern ttb_entry_t pmap_kern_ttb; 	/* TTB for kernel p
 void pmap_bootstrap(vm_offset_t);
 void pmap_kenter(vm_offset_t, vm_paddr_t);
 void pmap_kremove(vm_offset_t);
-void *pmap_mapdev_attr(vm_paddr_t, vm_size_t, int);
 boolean_t pmap_page_is_mapped(vm_page_t);
 
 void pmap_tlb_flush(pmap_t, vm_offset_t);

Modified: stable/11/sys/arm/include/pmap.h
==============================================================================
--- stable/11/sys/arm/include/pmap.h	Wed Apr  4 02:13:27 2018	(r331970)
+++ stable/11/sys/arm/include/pmap.h	Wed Apr  4 02:17:26 2018	(r331971)
@@ -37,6 +37,7 @@
 #endif
 
 #ifdef _KERNEL
+#include <sys/systm.h>
 
 extern vm_paddr_t dump_avail[];
 extern vm_paddr_t phys_avail[];
@@ -52,6 +53,12 @@ void pmap_page_set_memattr(vm_page_t, vm_memattr_t);
 
 void *pmap_mapdev(vm_paddr_t, vm_size_t);
 void pmap_unmapdev(vm_offset_t, vm_size_t);
+
+static inline void *
+pmap_mapdev_attr(vm_paddr_t addr, vm_size_t size, int attr)
+{
+	panic("%s is not implemented yet!\n", __func__);
+}
 
 struct pcb;
 void pmap_set_pcb_pagedir(pmap_t, struct pcb *);