← Back to branch summary

~ubuntu-branches/debian/sid/linux-grsec/sid

« back to all changes in this revision

Viewing changes to mm/mlock.c

  • Committer: Package Import Robot
  • Author(s): Yves-Alexis Perez
  • Date: 2016-12-20 16:13:41 UTC
  • mfrom: (1.1.16)
  • Revision ID: package-import@ubuntu.com-20161220161341-sec3a0j4hvey3kr7
Tags: 4.8.15-1+grsec201612151923+1
http://bugs.debian.org/848803
* Merge changes from src:linux up to 4.8.15-1.
  - include the flex change, fixing FTBFS.                    closes: #848803
* Update grsecurity to 3.1-4.8.15-201612151923.
* debian/patches:
  - bugfix/all/net-handle-no-dst-on-skb-in-icmp6_send.patch disabled,
    already included in grsecurity.
* set CONFIG_LEGACY_VSYSCALL_NONE following src:linux.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mm/mlock.c
190
190
         */
191
191
        spin_lock_irq(zone_lru_lock(zone));
192
192
 
 
193
        if (!TestClearPageMlocked(page)) {
 
194
                /* Potentially, PTE-mapped THP: do not skip the rest PTEs */
 
195
                nr_pages = 1;
 
196
                goto unlock_out;
 
197
        }
 
198
 
193
199
        nr_pages = hpage_nr_pages(page);
194
 
        if (!TestClearPageMlocked(page))
195
 
                goto unlock_out;
196
 
 
197
200
        __mod_zone_page_state(zone, NR_MLOCK, -nr_pages);
198
201
 
199
202
        if (__munlock_isolate_lru_page(page, true)) {