projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'powerpc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[cascardo/linux.git]
/
arch
/
powerpc
/
kernel
/
eeh.c
diff --git
a/arch/powerpc/kernel/eeh.c
b/arch/powerpc/kernel/eeh.c
index
7429556
..
f257316
100644
(file)
--- a/
arch/powerpc/kernel/eeh.c
+++ b/
arch/powerpc/kernel/eeh.c
@@
-116,6
+116,7
@@
struct eeh_ops *eeh_ops = NULL;
/* Lock to avoid races due to multiple reports of an error */
DEFINE_RAW_SPINLOCK(confirm_error_lock);
/* Lock to avoid races due to multiple reports of an error */
DEFINE_RAW_SPINLOCK(confirm_error_lock);
+EXPORT_SYMBOL_GPL(confirm_error_lock);
/* Lock to protect passed flags */
static DEFINE_MUTEX(eeh_dev_mutex);
/* Lock to protect passed flags */
static DEFINE_MUTEX(eeh_dev_mutex);
@@
-1044,7
+1045,7
@@
int eeh_init(void)
if (eeh_enabled())
pr_info("EEH: PCI Enhanced I/O Error Handling Enabled\n");
else
if (eeh_enabled())
pr_info("EEH: PCI Enhanced I/O Error Handling Enabled\n");
else
- pr_
warn
("EEH: No capable adapters found\n");
+ pr_
info
("EEH: No capable adapters found\n");
return ret;
}
return ret;
}
@@
-1502,6
+1503,7
@@
int eeh_pe_set_option(struct eeh_pe *pe, int option)
break;
case EEH_OPT_THAW_MMIO:
case EEH_OPT_THAW_DMA:
break;
case EEH_OPT_THAW_MMIO:
case EEH_OPT_THAW_DMA:
+ case EEH_OPT_FREEZE_PE:
if (!eeh_ops || !eeh_ops->set_option) {
ret = -ENOENT;
break;
if (!eeh_ops || !eeh_ops->set_option) {
ret = -ENOENT;
break;