projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix error-path NULL deref in alloc_posix_timer()
[deliverable/linux.git]
/
mm
/
page_isolation.c
diff --git
a/mm/page_isolation.c
b/mm/page_isolation.c
index 8f92a29695cc93e82e19582c998b6702ff5e9a2f..c69f84fe038d8b725b8639aae0fd88151206b515 100644
(file)
--- a/
mm/page_isolation.c
+++ b/
mm/page_isolation.c
@@
-2,7
+2,6
@@
* linux/mm/page_isolation.c
*/
* linux/mm/page_isolation.c
*/
-#include <stddef.h>
#include <linux/mm.h>
#include <linux/page-isolation.h>
#include <linux/pageblock-flags.h>
#include <linux/mm.h>
#include <linux/page-isolation.h>
#include <linux/pageblock-flags.h>
@@
-55,7
+54,7
@@
start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn)
return 0;
undo:
for (pfn = start_pfn;
return 0;
undo:
for (pfn = start_pfn;
- pfn <
=
undo_pfn;
+ pfn < undo_pfn;
pfn += pageblock_nr_pages)
unset_migratetype_isolate(pfn_to_page(pfn));
pfn += pageblock_nr_pages)
unset_migratetype_isolate(pfn_to_page(pfn));
@@
-76,7
+75,7
@@
undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn)
pfn < end_pfn;
pfn += pageblock_nr_pages) {
page = __first_valid_page(pfn, pageblock_nr_pages);
pfn < end_pfn;
pfn += pageblock_nr_pages) {
page = __first_valid_page(pfn, pageblock_nr_pages);
- if (!page || get_pageblock_
flags
(page) != MIGRATE_ISOLATE)
+ if (!page || get_pageblock_
migratetype
(page) != MIGRATE_ISOLATE)
continue;
unset_migratetype_isolate(page);
}
continue;
unset_migratetype_isolate(page);
}
@@
-126,7
+125,7
@@
int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn)
*/
for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages) {
page = __first_valid_page(pfn, pageblock_nr_pages);
*/
for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages) {
page = __first_valid_page(pfn, pageblock_nr_pages);
- if (page && get_pageblock_
flags
(page) != MIGRATE_ISOLATE)
+ if (page && get_pageblock_
migratetype
(page) != MIGRATE_ISOLATE)
break;
}
if (pfn < end_pfn)
break;
}
if (pfn < end_pfn)
This page took
0.026685 seconds
and
5
git commands to generate.