summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-11-19 10:11:00 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-19 10:18:43 +0100
commitd31eead2af88a66734c212f5338b13e6573608ee (patch)
treeab2f961bd0aea4014f90b49e9e497567abbc9e97 /meta/recipes-extended/ltp
parent99c6e89db193d572e845f95eabbd9ec89c3508c7 (diff)
downloadpoky-d31eead2af88a66734c212f5338b13e6573608ee.tar.gz
ltp: fix an incorrect macro checking
The previous patch added a check but incorrectly change the elif to if, then it always return 0 for cpuid if the machine is not __i386__ getcpu01 1 TFAIL : getcpu01.c:140: getcpu() returned wrong value expected cpuid:7, returned value cpuid: 0 After this fix: getcpu01 1 TPASS : getcpu() returned proper cpuid:7, node id:0 (From OE-Core rev: ca798705b3b8fa9b2f6467970e9bda9d9433986c) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ltp')
-rw-r--r--meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch7
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch b/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
index d123074207..41f2623620 100644
--- a/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
+++ b/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
@@ -88,22 +88,19 @@ index c927512..921b107 100644
88 88
89 void cleanup(void); 89 void cleanup(void);
90 void setup(void); 90 void setup(void);
91@@ -164,9 +172,14 @@ static inline int getcpu(unsigned *cpu_id, unsigned *node_id, 91@@ -164,7 +172,11 @@ static inline int getcpu(unsigned *cpu_id, unsigned *node_id,
92 { 92 {
93 #if defined(__i386__) 93 #if defined(__i386__)
94 return syscall(318, cpu_id, node_id, cache_struct); 94 return syscall(318, cpu_id, node_id, cache_struct);
95-#elif __GLIBC_PREREQ(2,6) 95-#elif __GLIBC_PREREQ(2,6)
96+#if defined(__GLIBC__) 96+#elif defined(__GLIBC__)
97+#if __GLIBC_PREREQ(2,6) 97+#if __GLIBC_PREREQ(2,6)
98+ *cpu_id = sched_getcpu(); 98+ *cpu_id = sched_getcpu();
99+#endif 99+#endif
100+#else 100+#else
101 *cpu_id = sched_getcpu(); 101 *cpu_id = sched_getcpu();
102 #endif 102 #endif
103+#endif
104 return 0; 103 return 0;
105 }
106
107@@ -191,15 +204,20 @@ unsigned int set_cpu_affinity(void) 104@@ -191,15 +204,20 @@ unsigned int set_cpu_affinity(void)
108 cpu_set_t *set; 105 cpu_set_t *set;
109 size_t size; 106 size_t size;