Page MenuHomeFreeBSD
Files F160957649

D19983.id56424.diff
No OneTemporary
Actions

D19983.id56424.diff
View Options

Index: sys/compat/linuxkpi/common/include/linux/io.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/io.h
+++ sys/compat/linuxkpi/common/include/linux/io.h
@@ -350,7 +350,7 @@
}
#endif
-#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
+#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__) || defined(__aarch64__)
void *_ioremap_attr(vm_paddr_t phys_addr, unsigned long size, int attr);
#else
#define _ioremap_attr(...) NULL
Index: sys/compat/linuxkpi/common/src/linux_compat.c
===================================================================
--- sys/compat/linuxkpi/common/src/linux_compat.c
+++ sys/compat/linuxkpi/common/src/linux_compat.c
@@ -1773,7 +1773,7 @@
return (vmmap);
}
-#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
+#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__) || defined(__aarch64__)
void *
_ioremap_attr(vm_paddr_t phys_addr, unsigned long size, int attr)
{
@@ -1796,7 +1796,7 @@
vmmap = vmmap_remove(addr);
if (vmmap == NULL)
return;
-#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
+#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__) || defined(__aarch64__)
pmap_unmapdev((vm_offset_t)addr, vmmap->vm_size);
#endif
kfree(vmmap);
Index: sys/modules/Makefile
===================================================================
--- sys/modules/Makefile
+++ sys/modules/Makefile
@@ -483,6 +483,19 @@
SUBDIR+= linprocfs
SUBDIR+= linsysfs
_ena= ena
+_mlx4= mlx4
+_mlx5= mlx5
+.if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \
+ defined(ALL_MODULES)
+_mlx4en= mlx4en
+_mlx5en= mlx5en
+.endif
+.if ${MK_OFED} != "no" || defined(ALL_MODULES)
+_mthca= mthca
+_mlx4ib= mlx4ib
+_mlx5ib= mlx5ib
+.endif
+
.endif
.if ${MK_NAND} != "no" || defined(ALL_MODULES)
@@ -673,18 +686,6 @@
_iwmfw= iwmfw
_iwnfw= iwnfw
.endif
-_mlx4= mlx4
-_mlx5= mlx5
-.if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \
- defined(ALL_MODULES)
-_mlx4en= mlx4en
-_mlx5en= mlx5en
-.endif
-.if ${MK_OFED} != "no" || defined(ALL_MODULES)
-_mthca= mthca
-_mlx4ib= mlx4ib
-_mlx5ib= mlx5ib
-.endif
_mly= mly
_nfe= nfe
_nvd= nvd

File Metadata

Mime Type
text/plain
Expires
Tue, Jun 30, 10:14 AM (16 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34496336
Default Alt Text
D19983.id56424.diff (2 KB)

Event Timeline