diff options
Diffstat (limited to 'arch/powerpc/platforms/pseries/ras.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/ras.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c index 49b305f9c15..b046bcf7443 100644 --- a/arch/powerpc/platforms/pseries/ras.c +++ b/arch/powerpc/platforms/pseries/ras.c | |||
@@ -51,6 +51,8 @@ | |||
51 | #include <asm/udbg.h> | 51 | #include <asm/udbg.h> |
52 | #include <asm/firmware.h> | 52 | #include <asm/firmware.h> |
53 | 53 | ||
54 | #include "ras.h" | ||
55 | |||
54 | static unsigned char ras_log_buf[RTAS_ERROR_LOG_MAX]; | 56 | static unsigned char ras_log_buf[RTAS_ERROR_LOG_MAX]; |
55 | static DEFINE_SPINLOCK(ras_log_buf_lock); | 57 | static DEFINE_SPINLOCK(ras_log_buf_lock); |
56 | 58 | ||
@@ -278,7 +280,7 @@ static void fwnmi_release_errinfo(void) | |||
278 | printk("FWNMI: nmi-interlock failed: %d\n", ret); | 280 | printk("FWNMI: nmi-interlock failed: %d\n", ret); |
279 | } | 281 | } |
280 | 282 | ||
281 | void pSeries_system_reset_exception(struct pt_regs *regs) | 283 | int pSeries_system_reset_exception(struct pt_regs *regs) |
282 | { | 284 | { |
283 | if (fwnmi_active) { | 285 | if (fwnmi_active) { |
284 | struct rtas_error_log *errhdr = fwnmi_get_errinfo(regs); | 286 | struct rtas_error_log *errhdr = fwnmi_get_errinfo(regs); |
@@ -287,6 +289,7 @@ void pSeries_system_reset_exception(struct pt_regs *regs) | |||
287 | } | 289 | } |
288 | fwnmi_release_errinfo(); | 290 | fwnmi_release_errinfo(); |
289 | } | 291 | } |
292 | return 0; /* need to perform reset */ | ||
290 | } | 293 | } |
291 | 294 | ||
292 | /* | 295 | /* |