diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-12-01 12:02:23 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-12-01 12:02:23 +0800 |
commit | a5e9874fc9e05e8471bfd58cabd75a3432d38ba6 (patch) | |
tree | ff0a388af912d9a20635ea8bae6f82e660dcf427 /include/linux/irqchip/arm-gic-v3.h | |
parent | 0a2aefa1f71da3bb10634918c68f6fb0068c1052 (diff) | |
parent | 8576fa45c10e665bb72931a31461c7310f3c5494 (diff) |
Merge tag 'v4.1.36' into linux-linaro-lsk-v4.1lsk-v4.1-16.12
This is the 4.1.36 stable release
Diffstat (limited to 'include/linux/irqchip/arm-gic-v3.h')
-rw-r--r-- | include/linux/irqchip/arm-gic-v3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index d14568e05047..a46dfd5fb9e8 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -218,7 +218,7 @@ #define GITS_BASER_TYPE_SHIFT (56) #define GITS_BASER_TYPE(r) (((r) >> GITS_BASER_TYPE_SHIFT) & 7) #define GITS_BASER_ENTRY_SIZE_SHIFT (48) -#define GITS_BASER_ENTRY_SIZE(r) ((((r) >> GITS_BASER_ENTRY_SIZE_SHIFT) & 0xff) + 1) +#define GITS_BASER_ENTRY_SIZE(r) ((((r) >> GITS_BASER_ENTRY_SIZE_SHIFT) & 0x1f) + 1) #define GITS_BASER_NonShareable (0UL << 10) #define GITS_BASER_InnerShareable (1UL << 10) #define GITS_BASER_OuterShareable (2UL << 10) |