projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm64
/
include
/
asm
/
arch_gicv3.h
diff --git
a/arch/arm64/include/asm/arch_gicv3.h
b/arch/arm64/include/asm/arch_gicv3.h
index 030cdcb46c6bdabd8bb49901ed231fcdbb5c25fd..8ec88e5b290f9bc12a416841e73ef56414972b59 100644
(file)
--- a/
arch/arm64/include/asm/arch_gicv3.h
+++ b/
arch/arm64/include/asm/arch_gicv3.h
@@
-77,6
+77,7
@@
#ifndef __ASSEMBLY__
#include <linux/stringify.h>
+#include <asm/barrier.h>
/*
* Low-level accessors
@@
-102,6
+103,7
@@
static inline u64 gic_read_iar_common(void)
u64 irqstat;
asm volatile("mrs_s %0, " __stringify(ICC_IAR1_EL1) : "=r" (irqstat));
+ dsb(sy);
return irqstat;
}