diff options
-rw-r--r-- | arch/powerpc/kernel/eeh.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/eeh_driver.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 4bd687d5e7aa..f4b7a227f183 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c | |||
@@ -84,7 +84,7 @@ | |||
84 | #define EEH_MAX_FAILS 2100000 | 84 | #define EEH_MAX_FAILS 2100000 |
85 | 85 | ||
86 | /* Time to wait for a PCI slot to report status, in milliseconds */ | 86 | /* Time to wait for a PCI slot to report status, in milliseconds */ |
87 | #define PCI_BUS_RESET_WAIT_MSEC (60*1000) | 87 | #define PCI_BUS_RESET_WAIT_MSEC (5*60*1000) |
88 | 88 | ||
89 | /* Platform dependent EEH operations */ | 89 | /* Platform dependent EEH operations */ |
90 | struct eeh_ops *eeh_ops = NULL; | 90 | struct eeh_ops *eeh_ops = NULL; |
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c index 36bed5a12750..4ef59c33777f 100644 --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c | |||
@@ -468,7 +468,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus) | |||
468 | /* The longest amount of time to wait for a pci device | 468 | /* The longest amount of time to wait for a pci device |
469 | * to come back on line, in seconds. | 469 | * to come back on line, in seconds. |
470 | */ | 470 | */ |
471 | #define MAX_WAIT_FOR_RECOVERY 150 | 471 | #define MAX_WAIT_FOR_RECOVERY 300 |
472 | 472 | ||
473 | static void eeh_handle_normal_event(struct eeh_pe *pe) | 473 | static void eeh_handle_normal_event(struct eeh_pe *pe) |
474 | { | 474 | { |