diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-01-15 23:37:30 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-01-15 23:37:30 -0500 |
| commit | 61435038b90d70bd7a9bcb7c0af26df5402e3f73 (patch) | |
| tree | eb5eaedd965bc888616d6c47f874a0c48ba8a247 /mm | |
| parent | 9d111c9c3814158097723d27029a9d214a8cd20e (diff) | |
| parent | 94f578e6aba14bb2aeb00db2e7f6e5f704fee937 (diff) | |
Merge tag 'v3.4.76' into v3.4-rt
This is the 3.4.76 stable release
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/rmap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/rmap.c b/mm/rmap.c index bfca52c96999..f02c862fab69 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -623,7 +623,11 @@ pte_t *__page_check_address(struct page *page, struct mm_struct *mm, spinlock_t *ptl; if (unlikely(PageHuge(page))) { + /* when pud is not present, pte will be NULL */ pte = huge_pte_offset(mm, address); + if (!pte) + return NULL; + ptl = &mm->page_table_lock; goto check; } |