diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mmap.c | 6 | ||||
| -rw-r--r-- | mm/mprotect.c | 4 |
2 files changed, 5 insertions, 5 deletions
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <linux/mempolicy.h> | 28 | #include <linux/mempolicy.h> |
| 29 | #include <linux/rmap.h> | 29 | #include <linux/rmap.h> |
| 30 | #include <linux/mmu_notifier.h> | 30 | #include <linux/mmu_notifier.h> |
| 31 | #include <linux/perf_counter.h> | 31 | #include <linux/perf_event.h> |
| 32 | 32 | ||
| 33 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
| 34 | #include <asm/cacheflush.h> | 34 | #include <asm/cacheflush.h> |
| @@ -1220,7 +1220,7 @@ munmap_back: | |||
| 1220 | if (correct_wcount) | 1220 | if (correct_wcount) |
| 1221 | atomic_inc(&inode->i_writecount); | 1221 | atomic_inc(&inode->i_writecount); |
| 1222 | out: | 1222 | out: |
| 1223 | perf_counter_mmap(vma); | 1223 | perf_event_mmap(vma); |
| 1224 | 1224 | ||
| 1225 | mm->total_vm += len >> PAGE_SHIFT; | 1225 | mm->total_vm += len >> PAGE_SHIFT; |
| 1226 | vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT); | 1226 | vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT); |
| @@ -2308,7 +2308,7 @@ int install_special_mapping(struct mm_struct *mm, | |||
| 2308 | 2308 | ||
| 2309 | mm->total_vm += len >> PAGE_SHIFT; | 2309 | mm->total_vm += len >> PAGE_SHIFT; |
| 2310 | 2310 | ||
| 2311 | perf_counter_mmap(vma); | 2311 | perf_event_mmap(vma); |
| 2312 | 2312 | ||
| 2313 | return 0; | 2313 | return 0; |
| 2314 | } | 2314 | } |
diff --git a/mm/mprotect.c b/mm/mprotect.c index d80311baeb2d..8bc969d8112d 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/swapops.h> | 23 | #include <linux/swapops.h> |
| 24 | #include <linux/mmu_notifier.h> | 24 | #include <linux/mmu_notifier.h> |
| 25 | #include <linux/migrate.h> | 25 | #include <linux/migrate.h> |
| 26 | #include <linux/perf_counter.h> | 26 | #include <linux/perf_event.h> |
| 27 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
| 28 | #include <asm/pgtable.h> | 28 | #include <asm/pgtable.h> |
| 29 | #include <asm/cacheflush.h> | 29 | #include <asm/cacheflush.h> |
| @@ -300,7 +300,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, | |||
| 300 | error = mprotect_fixup(vma, &prev, nstart, tmp, newflags); | 300 | error = mprotect_fixup(vma, &prev, nstart, tmp, newflags); |
| 301 | if (error) | 301 | if (error) |
| 302 | goto out; | 302 | goto out; |
| 303 | perf_counter_mmap(vma); | 303 | perf_event_mmap(vma); |
| 304 | nstart = tmp; | 304 | nstart = tmp; |
| 305 | 305 | ||
| 306 | if (nstart < prev->vm_end) | 306 | if (nstart < prev->vm_end) |
