OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9a3eda2
)
powerpc/eeh: Cleanup eeh_enabled()
author
Sam Bobroff
<sbobroff@linux.ibm.com>
Wed, 12 Sep 2018 01:23:29 +0000
(11:23 +1000)
committer
Michael Ellerman
<mpe@ellerman.id.au>
Sat, 13 Oct 2018 11:21:25 +0000
(22:21 +1100)
Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/include/asm/eeh.h
patch
|
blob
|
history
diff --git
a/arch/powerpc/include/asm/eeh.h
b/arch/powerpc/include/asm/eeh.h
index
b48b08e
..
247f09c
100644
(file)
--- a/
arch/powerpc/include/asm/eeh.h
+++ b/
arch/powerpc/include/asm/eeh.h
@@
-241,11
+241,7
@@
static inline bool eeh_has_flag(int flag)
static inline bool eeh_enabled(void)
{
- if (eeh_has_flag(EEH_FORCE_DISABLED) ||
- !eeh_has_flag(EEH_ENABLED))
- return false;
-
- return true;
+ return eeh_has_flag(EEH_ENABLED) && !eeh_has_flag(EEH_FORCE_DISABLED);
}
static inline void eeh_serialize_lock(unsigned long *flags)