svn commit: r319675 - in head/sys/compat/linuxkpi/common: include/linux src

[Justin Hibbits]

Author: jhibbits
Date: Thu Jun  8 02:44:34 2017
New Revision: 319675
URL: https://svnweb.freebsd.org/changeset/base/319675

Log:
  Remove ARM and MIPS from linuxkpi ioremap_attr definition
  
  ARM and MIPS fail universe builds.
  
  ARM and MIPS are missing the following:
  * VM_MEMATTR_WRITE_THROUGH
  * VM_MEMATTR_WRITE_COMBINING
  
  Pointy-hat to:	jhibbits

Modified:
  head/sys/compat/linuxkpi/common/include/linux/io.h
  head/sys/compat/linuxkpi/common/src/linux_compat.c

Modified: head/sys/compat/linuxkpi/common/include/linux/io.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/io.h	Thu Jun  8 01:42:32 2017	(r319674)
+++ head/sys/compat/linuxkpi/common/include/linux/io.h	Thu Jun  8 02:44:34 2017	(r319675)
@@ -180,8 +180,7 @@ _outb(u_char data, u_int port)
 }
 #endif
 
-#if defined(__i386__) || defined(__amd64__) || \
-    defined(__arm__) || defined(__mips__) || defined(__powerpc__)
+#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
 void *_ioremap_attr(vm_paddr_t phys_addr, unsigned long size, int attr);
 #else
 #define	_ioremap_attr(...) NULL

Modified: head/sys/compat/linuxkpi/common/src/linux_compat.c
==============================================================================
--- head/sys/compat/linuxkpi/common/src/linux_compat.c	Thu Jun  8 01:42:32 2017	(r319674)
+++ head/sys/compat/linuxkpi/common/src/linux_compat.c	Thu Jun  8 02:44:34 2017	(r319675)
@@ -1415,8 +1415,7 @@ vmmap_remove(void *addr)
 	return (vmmap);
 }
 
-#if defined(__i386__) || defined(__amd64__) || \
-    defined(__arm__) || defined(__mips__) || defined(__powerpc__)
+#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
 void *
 _ioremap_attr(vm_paddr_t phys_addr, unsigned long size, int attr)
 {
@@ -1439,8 +1438,7 @@ iounmap(void *addr)
 	vmmap = vmmap_remove(addr);
 	if (vmmap == NULL)
 		return;
-#if defined(__i386__) || defined(__amd64__) || \
-    defined(__arm__) || defined(__mips__) || defined(__powerpc__)
+#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
 	pmap_unmapdev((vm_offset_t)addr, vmmap->vm_size);
 #endif
 	kfree(vmmap);