From: Gerd Rausch Date: Mon, 13 Jun 2016 17:31:07 +0000 (+0200) Subject: sif: ARMv8 (aarch64) portability changes. X-Git-Tag: v4.1.12-92~129^2~25 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bdb3cdc36ed90c036408b871a958852275a6bfe5;p=users%2Fjedix%2Flinux-maple.git sif: ARMv8 (aarch64) portability changes. Signed-off-by: Gerd Rausch Reviewed-by: Knut Omang --- diff --git a/drivers/infiniband/hw/sif/sif_defs.c b/drivers/infiniband/hw/sif/sif_defs.c index 123509d313a2..cee42682545f 100644 --- a/drivers/infiniband/hw/sif/sif_defs.c +++ b/drivers/infiniband/hw/sif/sif_defs.c @@ -503,7 +503,7 @@ const char *ib_event2str(enum ib_event_type e) static inline enum kernel_ulp_type find_ulp_type_from_address(void *ptr) { if (ptr) { -#if defined(__x86_64__) || defined(__sparc__) +#if defined(__x86_64__) || defined(__sparc__) || defined(__aarch64__) char symbol_name[100]; snprintf(symbol_name, sizeof(symbol_name), "%ps", ptr); diff --git a/drivers/infiniband/hw/sif/sif_int_user.h b/drivers/infiniband/hw/sif/sif_int_user.h index bed597d1b694..1654268208d5 100644 --- a/drivers/infiniband/hw/sif/sif_int_user.h +++ b/drivers/infiniband/hw/sif/sif_int_user.h @@ -23,7 +23,7 @@ #include "psif_hw_data.h" /* Do this the brute force way, since structs are used in user-space */ -#if defined(__x86_64__) || defined(__sparc__) +#if defined(__x86_64__) || defined(__sparc__) || defined(__aarch64__) #define SIF_CACHE_BYTES 64 #else #define SIF_CACHE_BYTES 64