summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpsen <pankaj.sen@stericsson.com>2011-08-26 10:45:17 +0530
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:06:56 +0200
commit6ff360b7b070fa5bbcf8bada29c8aeca0da8dc04 (patch)
tree2ec867c2435d16bc16afd7ecc9785342cb0443d9
parent1fb19303dabd06c8fffb35236a24d9067ad37861 (diff)
Set Current Pid to Tid
* in case of tid is zero * Check for KERNELRLEASE instead of MM_MAKEFILES_DIR in Makefile
-rw-r--r--drivers/staging/nmf-cm/Makefile2
-rw-r--r--drivers/staging/nmf-cm/cm_syscall.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/nmf-cm/Makefile b/drivers/staging/nmf-cm/Makefile
index 82fa97f81d1..0728ac5bc3f 100644
--- a/drivers/staging/nmf-cm/Makefile
+++ b/drivers/staging/nmf-cm/Makefile
@@ -7,7 +7,7 @@
#
# Rules to build kernel modules
#
-ifndef MM_MAKEFILES_DIR
+ifdef KERNELRELEASE
# $(src): current relative dir; $(kbuild-dir): cur absolute dir
ifdef kbuild-dir
diff --git a/drivers/staging/nmf-cm/cm_syscall.c b/drivers/staging/nmf-cm/cm_syscall.c
index 8a48ac10c60..70f73e8ad97 100644
--- a/drivers/staging/nmf-cm/cm_syscall.c
+++ b/drivers/staging/nmf-cm/cm_syscall.c
@@ -13,6 +13,7 @@
#include "cmld.h"
#include <cm/engine/memory/inc/remote_allocator.h>
#include <linux/kernel.h>
+#include <linux/sched.h>
/** Dequeue and free per-process messages for specific binding
*
@@ -1379,8 +1380,8 @@ int cmld_PrivReserveMemory(struct cm_process_priv *procPriv, unsigned int physAd
__func__, current->pid, physAddr, (int)curr->tid);*/
err = -EBUSY;
} else {
- curr->tid = 0;
//current->pid;
+ curr->tid = current->pid;
err = 0;
}
break;