On 29 June 2015 at 12:41, Alex Shi alex.shi@linaro.org wrote:
For current 3.10 LSK, I ma going to submit a commit as following:
Any concern for this patch?
commit 25af66fbddd13fdcf85a7a9d0d4e790e7ca23ff8 Author: Alex Shi alex.shi@linaro.org Date: Mon Jun 29 15:05:53 2015 +0800
prctl: resolve PR_SET_TIMERSLACK_PID/PR_SET_THP_DISABLE conflict In android kernel the PR_SET_TIMERSLACK_PID defined as number 41 which conflict with PR_SET_THP_DISABLE in upstream kernel from 3.15. So redefine it's number to 47 to avoid the possible confliction. Signed-off-by: Alex Shi <alex.shi@linaro.org>diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h index 28bb0b3..8c6edff 100644 --- a/include/uapi/linux/prctl.h +++ b/include/uapi/linux/prctl.h @@ -153,7 +153,7 @@
- arg2 slack value, 0 means "use default"
- arg3 pid of the thread whose timer slack needs to be set
*/ -#define PR_SET_TIMERSLACK_PID 41 +#define PR_SET_TIMERSLACK_PID 47
Problem is that the Android userspace is redefining PR_SET_TIMERSLACK_PID back to 41 [1]. So this kernel patch alone would not help.
Regards, Amit Pundir
[1] https://android.googlesource.com/platform/system/core/+/master/libcutils/sch... .......... // This prctl is only available in Android kernels. #define PR_SET_TIMERSLACK_PID 41 .....................
#define PR_SET_VMA 0x53564d41 # define PR_SET_VMA_ANON_NAME 0
On 06/26/2015 07:52 AM, John Stultz wrote:
Just as a heads up, in mainline we have:
#define PR_MPX_ENABLE_MANAGEMENT 43 #define PR_MPX_DISABLE_MANAGEMENT 44 #define PR_SET_FP_MODE 45 #define PR_GET_FP_MODE 46
So it might be good to suggest SET_TIMERSLACK_PID to be set to a large number so we avoid constant collsions while it is out of tree.
Spurred by this, I've folded the related patches together and submitted for comment to lkml. https://lkml.org/lkml/2015/6/25/691