diff options
| author | Arnd Bergmann | 2006-01-04 20:55:53 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2006-01-09 05:44:32 +0100 |
| commit | c902be71dc6d5e8473bd021feafc8c3608e2b82a (patch) | |
| tree | 527b15800ed84edd16a5d53d165275a48cea1915 /arch/powerpc/platforms/pseries/ras.c | |
| parent | [PATCH] powerpc: fixing compile issue with !CONFIG_PCI in legacy_serial.c (diff) | |
| download | kernel-qcow2-linux-c902be71dc6d5e8473bd021feafc8c3608e2b82a.tar.gz kernel-qcow2-linux-c902be71dc6d5e8473bd021feafc8c3608e2b82a.tar.xz kernel-qcow2-linux-c902be71dc6d5e8473bd021feafc8c3608e2b82a.zip | |
[PATCH] cell: enable pause(0) in cpu_idle
This patch enables support for pause(0) power management state
for the Cell Broadband Processor, which is import for power efficient
operation. The pervasive infrastructure will in the future enable
us to introduce more functionality specific to the Cell's
pervasive unit.
From: Maximino Aguilar <maguilar@us.ibm.com>
Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
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 49b305f9c152..b046bcf7443d 100644 --- a/arch/powerpc/platforms/pseries/ras.c +++ b/arch/powerpc/platforms/pseries/ras.c @@ -51,6 +51,8 @@ #include <asm/udbg.h> #include <asm/firmware.h> +#include "ras.h" + static unsigned char ras_log_buf[RTAS_ERROR_LOG_MAX]; static DEFINE_SPINLOCK(ras_log_buf_lock); @@ -278,7 +280,7 @@ static void fwnmi_release_errinfo(void) printk("FWNMI: nmi-interlock failed: %d\n", ret); } -void pSeries_system_reset_exception(struct pt_regs *regs) +int pSeries_system_reset_exception(struct pt_regs *regs) { if (fwnmi_active) { struct rtas_error_log *errhdr = fwnmi_get_errinfo(regs); @@ -287,6 +289,7 @@ void pSeries_system_reset_exception(struct pt_regs *regs) } fwnmi_release_errinfo(); } + return 0; /* need to perform reset */ } /* |