diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-01-26 11:40:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-26 11:40:13 +0100 |
| commit | 4e9f44ba29f20484615a461244bfd3a419391490 (patch) | |
| tree | 490dd38bb8d14765327cee0be2f9731254e9c402 /drivers/base/memory.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | x86/mce: Recognise machine check bank signature for data path error (diff) | |
| download | linux-4e9f44ba29f20484615a461244bfd3a419391490.tar.xz linux-4e9f44ba29f20484615a461244bfd3a419391490.zip | |
Merge tag 'mce-recovery-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce
Implement MCE recovery for the data load error path and assorted cleanups.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/base/memory.c')
| -rw-r--r-- | drivers/base/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index ed5de58c340f..9b3a71e391f4 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -466,7 +466,7 @@ store_hard_offline_page(struct device *dev, if (strict_strtoull(buf, 0, &pfn) < 0) return -EINVAL; pfn >>= PAGE_SHIFT; - ret = __memory_failure(pfn, 0, 0); + ret = memory_failure(pfn, 0, 0); return ret ? ret : count; } |