diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 17:08:09 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 17:08:09 -0800 |
commit | 5bc159e6cb7ca8d173195919ee935885c129011e (patch) | |
tree | 664360df9314d9c338a089da52bb3f2b97d5cdba /arch/ia64/kernel/mca_drv.c | |
parent | ad91e6fa0d331e419e4692d146cdc04e594a5bea (diff) | |
parent | 65b78722ce2a2dc76108b467f79b2c5b4864af82 (diff) | |
download | op-kernel-dev-5bc159e6cb7ca8d173195919ee935885c129011e.zip op-kernel-dev-5bc159e6cb7ca8d173195919ee935885c129011e.tar.gz |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/mca_drv.c')
-rw-r--r-- | arch/ia64/kernel/mca_drv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c index 3492e32..8fd93af 100644 --- a/arch/ia64/kernel/mca_drv.c +++ b/arch/ia64/kernel/mca_drv.c @@ -437,6 +437,9 @@ recover_from_read_error(slidx_table_t *slidx, * the process not have any locks of kernel. */ + /* Is minstate valid? */ + if (!peidx_bottom(peidx) || !(peidx_bottom(peidx)->valid.minstate)) + return 0; psr1 =(struct ia64_psr *)&(peidx_minstate_area(peidx)->pmsa_ipsr); /* |