diff options
| author | H. Peter Anvin <[email protected]> | 2010-10-12 00:05:11 +0000 |
|---|---|---|
| committer | H. Peter Anvin <[email protected]> | 2010-10-12 00:05:11 +0000 |
| commit | 8e4029ee3517084ae00fbfbcb51cc365d8857061 (patch) | |
| tree | 3d86578dc6160781a0c2fdad461e5195e73bfafc /Documentation/vm/page-types.c | |
| parent | memblock: Annotate memblock functions with __init_memblock (diff) | |
| parent | x86, numa: For each node, register the memory blocks actually used (diff) | |
| download | kernel-8e4029ee3517084ae00fbfbcb51cc365d8857061.tar.gz kernel-8e4029ee3517084ae00fbfbcb51cc365d8857061.zip | |
Merge branch 'x86/urgent' into core/memblock
Reason for merge:
Forward-port urgent change to arch/x86/mm/srat_64.c to the memblock tree.
Resolved Conflicts:
arch/x86/mm/srat_64.c
Originally-by: Yinghai Lu <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
Diffstat (limited to 'Documentation/vm/page-types.c')
| -rw-r--r-- | Documentation/vm/page-types.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/vm/page-types.c b/Documentation/vm/page-types.c index ccd951fa94ee..cc96ee2666f2 100644 --- a/Documentation/vm/page-types.c +++ b/Documentation/vm/page-types.c @@ -478,7 +478,7 @@ static void prepare_hwpoison_fd(void) } if (opt_unpoison && !hwpoison_forget_fd) { - sprintf(buf, "%s/renew-pfn", hwpoison_debug_fs); + sprintf(buf, "%s/unpoison-pfn", hwpoison_debug_fs); hwpoison_forget_fd = checked_open(buf, O_WRONLY); } } |