diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-23 13:20:42 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:06:54 +0200 |
| commit | 96d29093cb4ac7439d026ca2ff8c55b67b3010c8 (patch) | |
| tree | 87f74b9ec591914696685ed302c2fb1b805542f1 | |
| parent | 821308fa3824e39b05e6e76b42b645c7734be54f (diff) | |
staging: nmf-cm: Update for api changes in 3.0
Temp fix to make driver build until its fixed properly
Change-Id: I095a907abed7175180cbfa4bd2bc389060afceb1
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
| -rw-r--r-- | drivers/staging/nmf-cm/cm_service.c | 1 | ||||
| -rw-r--r-- | drivers/staging/nmf-cm/cm_syscall.c | 7 | ||||
| -rw-r--r-- | drivers/staging/nmf-cm/cmld.c | 1 | ||||
| -rw-r--r-- | drivers/staging/nmf-cm/osal-kernel.h | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/drivers/staging/nmf-cm/cm_service.c b/drivers/staging/nmf-cm/cm_service.c index 1b5ee111e09..cd7602a6cec 100644 --- a/drivers/staging/nmf-cm/cm_service.c +++ b/drivers/staging/nmf-cm/cm_service.c @@ -14,6 +14,7 @@ #include <linux/plist.h> #include <linux/slab.h> #include <linux/spinlock_types.h> +#include <linux/sched.h> #include <cm/engine/api/control/irq_engine.h> diff --git a/drivers/staging/nmf-cm/cm_syscall.c b/drivers/staging/nmf-cm/cm_syscall.c index d1ad3a1f935..8a48ac10c60 100644 --- a/drivers/staging/nmf-cm/cm_syscall.c +++ b/drivers/staging/nmf-cm/cm_syscall.c @@ -1374,12 +1374,13 @@ int cmld_PrivReserveMemory(struct cm_process_priv *procPriv, unsigned int physAd /* Mark this memory area reserved for a mapping for this thread ID */ /* It must not be already reserved but this should not happen */ if (curr->tid) { - pr_err("%s: thread %d can't reseveved memory %x already " + /*pr_err("%s: thread %d can't reseveved memory %x already " "reserved for %d\n", - __func__, current->pid, physAddr, curr->tid); + __func__, current->pid, physAddr, (int)curr->tid);*/ err = -EBUSY; } else { - curr->tid = current->pid; + curr->tid = 0; + //current->pid; err = 0; } break; diff --git a/drivers/staging/nmf-cm/cmld.c b/drivers/staging/nmf-cm/cmld.c index 04433f10f0c..9a7183c14fc 100644 --- a/drivers/staging/nmf-cm/cmld.c +++ b/drivers/staging/nmf-cm/cmld.c @@ -17,6 +17,7 @@ #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/uaccess.h> +#include <linux/sched.h> #include <cm/inc/cm_def.h> #include <cm/engine/api/cm_engine.h> diff --git a/drivers/staging/nmf-cm/osal-kernel.h b/drivers/staging/nmf-cm/osal-kernel.h index fd3b0acc301..36baf893fcc 100644 --- a/drivers/staging/nmf-cm/osal-kernel.h +++ b/drivers/staging/nmf-cm/osal-kernel.h @@ -18,6 +18,7 @@ #include <cm/engine/api/control/configuration_engine.h> #include <cm/engine/api/perfmeter_engine.h> #include <cm/engine/os_adaptation_layer/inc/os_adaptation_layer.h> +#include <linux/plist.h> #include "configuration.h" |