diff options
| author | Ingo Molnar <[email protected]> | 2014-01-05 11:34:29 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2014-01-05 11:34:29 +0000 |
| commit | ef0b8b9a521c65201bfca9747ee1bf374296133c (patch) | |
| tree | 644c3390c07d06fb7807182a4935f7c3f675b157 /mm/compaction.c | |
| parent | x86/efi: parse_efi_setup() build fix (diff) | |
| parent | Linux 3.13-rc7 (diff) | |
| download | kernel-ef0b8b9a521c65201bfca9747ee1bf374296133c.tar.gz kernel-ef0b8b9a521c65201bfca9747ee1bf374296133c.zip | |
Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts
Conflicts:
arch/x86/platform/efi/efi.c
drivers/firmware/efi/Kconfig
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'mm/compaction.c')
| -rw-r--r-- | mm/compaction.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/compaction.c b/mm/compaction.c index 805165bcd3dd..f58bcd016f43 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -134,6 +134,10 @@ static void update_pageblock_skip(struct compact_control *cc, bool migrate_scanner) { struct zone *zone = cc->zone; + + if (cc->ignore_skip_hint) + return; + if (!page) return; |