Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330278
b: refs/heads/master
c: 3ea1ae9
h: refs/heads/master
v: v3
  • Loading branch information
Gavin Shan authored and Benjamin Herrenschmidt committed Sep 9, 2012
1 parent 896b600 commit f1b5294
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7e4bbaf0bf13c33be275e8a17997597dfd0ed03a
refs/heads/master: 3ea1ae989a9ddcfe15b80dc8cea5c4d38a13b9ab
2 changes: 2 additions & 0 deletions trunk/arch/powerpc/platforms/pseries/eeh_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ static int __init eeh_dev_phb_init(void)
list_for_each_entry_safe(phb, tmp, &hose_list, list_node)
eeh_dev_phb_init_dynamic(phb);

pr_info("EEH: devices created\n");

return 0;
}

Expand Down
14 changes: 13 additions & 1 deletion trunk/arch/powerpc/platforms/pseries/eeh_pseries.c
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,19 @@ static struct eeh_ops pseries_eeh_ops = {
*/
static int __init eeh_pseries_init(void)
{
return eeh_ops_register(&pseries_eeh_ops);
int ret = -EINVAL;

if (!machine_is(pseries))
return ret;

ret = eeh_ops_register(&pseries_eeh_ops);
if (!ret)
pr_info("EEH: pSeries platform initialized\n");
else
pr_info("EEH: pSeries platform initialization failure (%d)\n",
ret);

return ret;
}

early_initcall(eeh_pseries_init);

0 comments on commit f1b5294

Please sign in to comment.