diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 01:42:04 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 01:42:04 -0400 |
commit | 8cdfd068c1ea54cca7d7ad6ad31335cc5d0d9905 (patch) | |
tree | 26a36ec23067a9e26baf3d46c65f70619ca4d808 /mm/sparse.c | |
parent | 4d537f37e0d39f64687be71087dca607ee507f5a (diff) | |
parent | 79a3aaa7b82e3106be97842dedfd8429248896e6 (diff) |
Merge 5.1-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/sparse.c')
-rw-r--r-- | mm/sparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/sparse.c b/mm/sparse.c index 69904aa6165b..56e057c432f9 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
@@ -567,7 +567,7 @@ void online_mem_sections(unsigned long start_pfn, unsigned long end_pfn) | |||
567 | } | 567 | } |
568 | 568 | ||
569 | #ifdef CONFIG_MEMORY_HOTREMOVE | 569 | #ifdef CONFIG_MEMORY_HOTREMOVE |
570 | /* Mark all memory sections within the pfn range as online */ | 570 | /* Mark all memory sections within the pfn range as offline */ |
571 | void offline_mem_sections(unsigned long start_pfn, unsigned long end_pfn) | 571 | void offline_mem_sections(unsigned long start_pfn, unsigned long end_pfn) |
572 | { | 572 | { |
573 | unsigned long pfn; | 573 | unsigned long pfn; |