summaryrefslogtreecommitdiff
path: root/drivers/misc/tegra-profiler/mmap.c
diff options
context:
space:
mode:
authorIgor Nabirushkin <inabirushkin@nvidia.com>2014-12-29 12:16:30 +0400
committerWinnie Hsu <whsu@nvidia.com>2015-01-29 22:05:27 -0800
commitc017b032a284d7cb1974f7e80a6c3613089b9c0e (patch)
tree1f9d6e50d2332f315749bd5d765de1561c1d755c /drivers/misc/tegra-profiler/mmap.c
parent6d956bb7ac0872a090b92d4ed4c842edf3c46963 (diff)
misc: tegra-profiler: fix debug preempt warningstegra-l4t-r21.3tegra-l4t-r21-er-2015-02-02
Tegra Profiler: fix warnings with CONFIG_DEBUG_PREEMPT=y * Add the missing preempt_disable/enable() pairs in start/stop ioctls. * Untie mmap and some other samples from the current cpu. Bug 200067410 Bug 1598009 Change-Id: I9f03facf3a0ecee20432019ea8094a349c7897d1 Signed-off-by: Igor Nabirushkin <inabirushkin@nvidia.com> Reviewed-on: http://git-master/r/668123 (cherry picked from commit ee3374eb9983d1ccadbf3a54c977d3e6db97ec4a) Reviewed-on: http://git-master/r/672042 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'drivers/misc/tegra-profiler/mmap.c')
-rw-r--r--drivers/misc/tegra-profiler/mmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/tegra-profiler/mmap.c b/drivers/misc/tegra-profiler/mmap.c
index 9e3e05f305a5..2347047d9873 100644
--- a/drivers/misc/tegra-profiler/mmap.c
+++ b/drivers/misc/tegra-profiler/mmap.c
@@ -76,7 +76,7 @@ void quadd_process_mmap(struct vm_area_struct *vma, pid_t pid)
if (!(vma->vm_flags & VM_EXEC))
return;
- tmp_buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
+ tmp_buf = kzalloc(PATH_MAX + sizeof(u64), GFP_ATOMIC);
if (!tmp_buf)
return;
@@ -164,7 +164,7 @@ int quadd_get_current_mmap(pid_t pid)
pr_info("Get mapped memory objects\n");
- tmp_buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
+ tmp_buf = kzalloc(PATH_MAX + sizeof(u64), GFP_ATOMIC);
if (!tmp_buf)
return -ENOMEM;