Tue Nov 3 08:41:30 2020 UTC ()
Fix build on aa64


(skrll)
diff -r1.22 -r1.23 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c
diff -r1.6 -r1.7 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h
cvs diff -r1.22 -r1.23 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c (expand / switch to unified diff)

--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c 2020/09/26 12:58:23 1.22
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c 2020/11/03 08:41:30 1.23
@@ -32,26 +32,28 @@ @@ -32,26 +32,28 @@
32 */ 32 */
33 33
34#include <interface/compat/vchi_bsd.h> 34#include <interface/compat/vchi_bsd.h>
35 35
36#include <sys/param.h> 36#include <sys/param.h>
37#include <sys/malloc.h> 37#include <sys/malloc.h>
38#include <sys/bus.h> 38#include <sys/bus.h>
39#include <sys/kmem.h> 39#include <sys/kmem.h>
40 40
41#include <linux/completion.h> 41#include <linux/completion.h>
42 42
43#include <uvm/uvm_extern.h> 43#include <uvm/uvm_extern.h>
44 44
 45#include <arm/cpufunc.h>
 46
45#include <arch/arm/broadcom/bcm2835_mbox.h> 47#include <arch/arm/broadcom/bcm2835_mbox.h>
46#include <arch/arm/broadcom/bcm2835var.h> 48#include <arch/arm/broadcom/bcm2835var.h>
47 49
48#define TOTAL_SLOTS (VCHIQ_SLOT_ZERO_SLOTS + 2 * 32) 50#define TOTAL_SLOTS (VCHIQ_SLOT_ZERO_SLOTS + 2 * 32)
49 51
50#define VCHIQ_DOORBELL_IRQ IRQ_ARM_DOORBELL_0 52#define VCHIQ_DOORBELL_IRQ IRQ_ARM_DOORBELL_0
51 53
52#define IS_USER_ADDRESS(va) \ 54#define IS_USER_ADDRESS(va) \
53 ((vaddr_t)(va) >= VM_MIN_ADDRESS && (vaddr_t)(va) < VM_MAX_ADDRESS) 55 ((vaddr_t)(va) >= VM_MIN_ADDRESS && (vaddr_t)(va) < VM_MAX_ADDRESS)
54 56
55#include "vchiq_arm.h" 57#include "vchiq_arm.h"
56#include "vchiq_2835.h" 58#include "vchiq_2835.h"
57#include "vchiq_netbsd.h" 59#include "vchiq_netbsd.h"
cvs diff -r1.6 -r1.7 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h (expand / switch to unified diff)

--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h 2020/09/26 12:58:23 1.6
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h 2020/11/03 08:41:30 1.7
@@ -27,26 +27,28 @@ @@ -27,26 +27,28 @@
27 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 27 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
28 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 28 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
29 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 29 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
30 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 30 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
31 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 31 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32 */ 32 */
33 33
34#ifndef VCHIQ_CORE_H 34#ifndef VCHIQ_CORE_H
35#define VCHIQ_CORE_H 35#define VCHIQ_CORE_H
36 36
37#include <interface/compat/vchi_bsd.h> 37#include <interface/compat/vchi_bsd.h>
38#include <linux/list.h> 38#include <linux/list.h>
39 39
 40#include <arm/cpufunc.h>
 41
40#include "vchiq_cfg.h" 42#include "vchiq_cfg.h"
41 43
42#include "vchiq.h" 44#include "vchiq.h"
43 45
44/* Run time control of log level, based on KERN_XXX level. */ 46/* Run time control of log level, based on KERN_XXX level. */
45#ifndef VCHIQ_LOG_DEFAULT 47#ifndef VCHIQ_LOG_DEFAULT
46#define VCHIQ_LOG_DEFAULT 7 48#define VCHIQ_LOG_DEFAULT 7
47#endif 49#endif
48#define VCHIQ_LOG_ERROR 3 50#define VCHIQ_LOG_ERROR 3
49#define VCHIQ_LOG_WARNING 4 51#define VCHIQ_LOG_WARNING 4
50#define VCHIQ_LOG_INFO 6 52#define VCHIQ_LOG_INFO 6
51#define VCHIQ_LOG_TRACE 7 53#define VCHIQ_LOG_TRACE 7
52 54