DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: scm: Mark scm_call_atomic*() return value as signed" into msm-3.0

Browse Source
This commit is contained in:
Linux Build Service Account
2011-12-14 18:21:11 -08:00
committed by QuIC Gerrit Code Review
parent 2be265f37f c2a77187de
commit a1d36c34cf
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-msm/include/mach/scm.h
View File

@@ -27,8 +27,8 @@
extern int scm_call(u32 svc_id, u32 cmd_id, const void *cmd_buf, size_t cmd_len, extern int scm_call(u32 svc_id, u32 cmd_id, const void *cmd_buf, size_t cmd_len,
void *resp_buf, size_t resp_len); void *resp_buf, size_t resp_len);
extern u32 scm_call_atomic1(u32 svc, u32 cmd, u32 arg1); extern s32 scm_call_atomic1(u32 svc, u32 cmd, u32 arg1);
extern u32 scm_call_atomic2(u32 svc, u32 cmd, u32 arg1, u32 arg2); extern s32 scm_call_atomic2(u32 svc, u32 cmd, u32 arg1, u32 arg2);
#define SCM_VERSION(major, minor) (((major) << 16) | ((minor) & 0xFF)) #define SCM_VERSION(major, minor) (((major) << 16) | ((minor) & 0xFF))
@@ -43,12 +43,12 @@ static inline int scm_call(u32 svc_id, u32 cmd_id, const void *cmd_buf,
return 0; return 0;
} }
static inline u32 scm_call_atomic1(u32 svc, u32 cmd, u32 arg1) static inline s32 scm_call_atomic1(u32 svc, u32 cmd, u32 arg1)
{ {
return 0; return 0;
} }
static inline u32 scm_call_atomic2(u32 svc, u32 cmd, u32 arg1, u32 arg2) static inline s32 scm_call_atomic2(u32 svc, u32 cmd, u32 arg1, u32 arg2)
{ {
return 0; return 0;
} }

4
arch/arm/mach-msm/scm.c
View File

@@ -282,7 +282,7 @@ EXPORT_SYMBOL(scm_call);
* This shall only be used with commands that are guaranteed to be * This shall only be used with commands that are guaranteed to be
* uninterruptable, atomic and SMP safe. * uninterruptable, atomic and SMP safe.
*/ */
u32 scm_call_atomic1(u32 svc, u32 cmd, u32 arg1) s32 scm_call_atomic1(u32 svc, u32 cmd, u32 arg1)
{ {
int context_id; int context_id;
register u32 r0 asm("r0") = SCM_ATOMIC(svc, cmd, 1); register u32 r0 asm("r0") = SCM_ATOMIC(svc, cmd, 1);
@@ -312,7 +312,7 @@ EXPORT_SYMBOL(scm_call_atomic1);
* This shall only be used with commands that are guaranteed to be * This shall only be used with commands that are guaranteed to be
* uninterruptable, atomic and SMP safe. * uninterruptable, atomic and SMP safe.
*/ */
u32 scm_call_atomic2(u32 svc, u32 cmd, u32 arg1, u32 arg2) s32 scm_call_atomic2(u32 svc, u32 cmd, u32 arg1, u32 arg2)
{ {
int context_id; int context_id;
register u32 r0 asm("r0") = SCM_ATOMIC(svc, cmd, 2); register u32 r0 asm("r0") = SCM_ATOMIC(svc, cmd, 2);