Patchwork [v4,2/2] librt: fix mq_timed{send,receive} return instructions

login
register
mail settings
Submitter Baruch Siach
Date Nov. 7, 2013, 12:38 p.m.
Message ID <440f1485bb7d2feb54c1188ffd54217b155d4208.1383827721.git.baruch@tkos.co.il>
Download mbox | patch
Permalink /patch/289308/
State Accepted, archived
Headers show

Comments

Baruch Siach - Nov. 7, 2013, 12:38 p.m.
Not all architectures use 'ret' as function return instruction. For example,
xtensa usually uses 'retw'. Use the ret_ERRVAL arch dependant macro instead.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v4: Split architecture ret_ERRVAL change to a separate patch as suggested by
	Bernhard Reutner-Fischer

v3: Add a common ret_ERRVAL, and redefine for special archs (Bernhard
	Reutner-Fischer)

v2: Add ret_ERRVAL to architectures missing it as noted by Bernhard
	Reutner-Fischer.
---
 librt/mq_timedreceive.S | 2 +-
 librt/mq_timedsend.S    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/librt/mq_timedreceive.S b/librt/mq_timedreceive.S
index 43a5fda..00fecac 100644
--- a/librt/mq_timedreceive.S
+++ b/librt/mq_timedreceive.S
@@ -3,6 +3,6 @@ 
 #error Missing definition of NR_timedreceive needed for cancellation.
 #endif
 PSEUDO(mq_timedreceive, mq_timedreceive, 5)
-ret
+ret_ERRVAL
 PSEUDO_END(mq_timedreceive)
 librt_hidden_def(mq_timedreceive)
diff --git a/librt/mq_timedsend.S b/librt/mq_timedsend.S
index 13d91da..ee8d483 100644
--- a/librt/mq_timedsend.S
+++ b/librt/mq_timedsend.S
@@ -3,6 +3,6 @@ 
 #error Missing definition of NR_timedsend needed for cancellation.
 #endif
 PSEUDO(mq_timedsend, mq_timedsend, 5)
-ret
+ret_ERRVAL
 PSEUDO_END(mq_timedsend)
 librt_hidden_def(mq_timedsend)