[Ltp-commits] [Git] ltp updated.

[Cyril H. <su...@li...>]

The branch, master, has been updated
       via  e5c18eaa4b8f9f73516eaf68213d6beee80cf3b5 (commit)
       via  b217b3ead51fa07d61455fb868db97ae0c732b02 (commit)
      from  2a63f690cf3361152bda1aa687f8c754b514b405 (commit)


- Log -----------------------------------------------------------------
commit e5c18eaa4b8f9f73516eaf68213d6beee80cf3b5
Author: Riku Voipio <rik...@li...>
Date:   Fri Oct 11 12:09:08 2013 +0300

    Remove bogus Aarch64 system call numbers
    
    Aarch64 build fails with:
    
    cacheflush01.c:52:26: fatal error: asm/cachectl.h: No such file or directory
     #include <asm/cachectl.h>
    
    This is caused by bogus definitions of cacheflush and set_tls, which are
    private 32bit ARM system calls. These should not be used on native
    Aarch64 binaries. If they need to be tested, it is better done using ltp
    compiled for 32bit ARM.
    
    Signed-off-by: Riku Voipio <rik...@li...>
    Signed-off-by: Mike Frysinger <va...@ge...>

commit b217b3ead51fa07d61455fb868db97ae0c732b02
Author: Stanislav Kholmanskikh <sta...@or...>
Date:   Wed Oct 9 17:11:09 2013 +0400

    tst_kvercmp2: Criteria for Oracle Linux UEK kernels
    
    Signed-off-by: Stanislav Kholmanskikh <sta...@or...>
    Acked-by: Wanlong Gao <gao...@cn...>
    Signed-off-by: Mike Frysinger <va...@ge...>

-----------------------------------------------------------------------

Summary of changes:
 lib/tst_kvercmp.c                                |    6 +++++-
 testcases/kernel/include/aarch64.in              |    2 --
 testcases/kernel/include/linux_syscall_numbers.h |    9 ---------
 3 files changed, 5 insertions(+), 12 deletions(-)
 
diff --git a/lib/tst_kvercmp.c b/lib/tst_kvercmp.c
index a703c47..a950120 100644
--- a/lib/tst_kvercmp.c
+++ b/lib/tst_kvercmp.c
@@ -95,8 +95,12 @@ int tst_kvercmp2(int r1, int r2, int r3, struct tst_kern_exv *vers)
 
 	uname(&uval);
 	kver = uval.release;
-	if (strstr(kver, ".el5")) {
+	if (strstr(kver, ".el5uek")) {
+		cur_dist_name = "OL5UEK";
+	} else if (strstr(kver, ".el5")) {
 		cur_dist_name = "RHEL5";
+	} else if (strstr(kver, ".el6uek")) {
+		cur_dist_name = "OL6UEK";
 	} else if (strstr(kver, ".el6")) {
 		cur_dist_name = "RHEL6";
 	}
diff --git a/testcases/kernel/include/aarch64.in b/testcases/kernel/include/aarch64.in
index a845be0..ceb67c6 100644
--- a/testcases/kernel/include/aarch64.in
+++ b/testcases/kernel/include/aarch64.in
@@ -253,5 +253,3 @@ clock_adjtime 266
 syncfs 267
 setns 268
 sendmmsg 269
-cacheflush 0x1002
-set_tls 0x1005
diff --git a/testcases/kernel/include/linux_syscall_numbers.h b/testcases/kernel/include/linux_syscall_numbers.h
index 38931cf..03664ce 100644
--- a/testcases/kernel/include/linux_syscall_numbers.h
+++ b/testcases/kernel/include/linux_syscall_numbers.h
@@ -801,12 +801,6 @@
 # ifndef __NR_sendmmsg
 #  define __NR_sendmmsg 269
 # endif
-# ifndef __NR_cacheflush
-#  define __NR_cacheflush 0x1002
-# endif
-# ifndef __NR_set_tls
-#  define __NR_set_tls 0x1005
-# endif
 #endif
 
 
@@ -12754,9 +12748,6 @@
 # ifndef __NR_settimeofday
 #  define __NR_settimeofday __LTP__NR_INVALID_SYSCALL
 # endif
-# ifndef __NR_set_tls
-#  define __NR_set_tls __LTP__NR_INVALID_SYSCALL
-# endif
 # ifndef __NR_setuid
 #  define __NR_setuid __LTP__NR_INVALID_SYSCALL
 # endif


hooks/post-receive
-- 
ltp