diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2017-08-23 14:47:51 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2017-08-23 14:48:05 +0100 |
| commit | 41921c54b898292b0140d5f322cc8ec5b0642a7e (patch) | |
| tree | 70c62f3b26536abf0fa4b347300c78360d4ff546 /drivers/crypto/dpaa2_sec/hw/compat.h | |
| parent | 76f89ef557ff345dfa606e797e1765404babce56 (diff) | |
| parent | f239aed5e674965691846e8ce3f187dd47523689 (diff) | |
Merge branch 'upstream' into HEAD
Change-Id: Ib9772cbbc33c14a44bd918056b22602ff6891a18
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/crypto/dpaa2_sec/hw/compat.h')
| -rw-r--r-- | drivers/crypto/dpaa2_sec/hw/compat.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/crypto/dpaa2_sec/hw/compat.h b/drivers/crypto/dpaa2_sec/hw/compat.h index 11fdaa8e..b17b27ef 100644 --- a/drivers/crypto/dpaa2_sec/hw/compat.h +++ b/drivers/crypto/dpaa2_sec/hw/compat.h @@ -5,7 +5,7 @@ * BSD LICENSE * * Copyright 2013-2016 Freescale Semiconductor Inc. - * Copyright (c) 2016 NXP. + * Copyright 2016 NXP. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -49,7 +49,9 @@ #include <stdlib.h> #include <stdio.h> #include <stdbool.h> + #include <rte_byteorder.h> +#include <rte_common.h> #ifndef __BYTE_ORDER__ #error "Undefined endianness" @@ -60,7 +62,7 @@ #endif #ifndef __always_inline -#define __always_inline (inline __attribute__((always_inline))) +#define __always_inline __rte_always_inline #endif #ifndef __always_unused |