From: Michal Simek <[email protected]> because of compilation fault for non x86 arch. (In my case for Microblaze cpu)
Signed-off-by: Michal Simek <[email protected]> --- testcases/kernel/sched/hyperthreading/Makefile | 8 -------- .../sched/hyperthreading/ht_affinity/HTaffinity.c | 2 +- .../sched/hyperthreading/ht_affinity/HTutils.c | 2 +- .../sched/hyperthreading/ht_enabled/HTenabled.c | 2 +- .../sched/hyperthreading/ht_enabled/HTutils.c | 2 +- .../hyperthreading/ht_interrupt/HTinterrupt.c | 2 +- .../sched/hyperthreading/ht_interrupt/HTutils.c | 2 +- 7 files changed, 6 insertions(+), 14 deletions(-) diff --git a/testcases/kernel/sched/hyperthreading/Makefile b/testcases/kernel/sched/hyperthreading/Makefile index 9296e04..2e0d64a 100644 --- a/testcases/kernel/sched/hyperthreading/Makefile +++ b/testcases/kernel/sched/hyperthreading/Makefile @@ -1,11 +1,3 @@ - -OSV := $(shell uname -m|grep i[3-6]86) -ifeq (,$(OSV)) -else -export CFLAGS+= -DARCH_i386 -endif - - SUBDIRS = ht_enabled ht_affinity ht_interrupt all: diff --git a/testcases/kernel/sched/hyperthreading/ht_affinity/HTaffinity.c b/testcases/kernel/sched/hyperthreading/ht_affinity/HTaffinity.c index b0750c3..3f033e7 100644 --- a/testcases/kernel/sched/hyperthreading/ht_affinity/HTaffinity.c +++ b/testcases/kernel/sched/hyperthreading/ht_affinity/HTaffinity.c @@ -230,7 +230,7 @@ int main(int argc, char *argv[]) { tst_resm(TINFO, "Begin: HyperThreading Affinity"); -#ifndef ARCH_i386 +#ifndef __i386__ tst_brkm(TCONF, NULL, "This test suite can only excute on i386 architecture."); #else if (!check_ht_capability()) diff --git a/testcases/kernel/sched/hyperthreading/ht_affinity/HTutils.c b/testcases/kernel/sched/hyperthreading/ht_affinity/HTutils.c index 5e33114..5f37d1f 100644 --- a/testcases/kernel/sched/hyperthreading/ht_affinity/HTutils.c +++ b/testcases/kernel/sched/hyperthreading/ht_affinity/HTutils.c @@ -60,7 +60,7 @@ int is_ht_kernel() inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx) { -#ifndef ARCH_i386 +#ifndef _i386__ return; #else __asm__("cpuid" diff --git a/testcases/kernel/sched/hyperthreading/ht_enabled/HTenabled.c b/testcases/kernel/sched/hyperthreading/ht_enabled/HTenabled.c index e0ccaad..9f5ab8b 100644 --- a/testcases/kernel/sched/hyperthreading/ht_enabled/HTenabled.c +++ b/testcases/kernel/sched/hyperthreading/ht_enabled/HTenabled.c @@ -23,7 +23,7 @@ int main(int argc, char *argv[]) { tst_resm(TINFO, "Begin: HyperThreading Enabled"); -#ifndef ARCH_i386 +#ifndef __i386__ tst_brkm(TCONF, NULL, "This test suite can only excute on i386 architecture."); #else if(is_cmdline_para("noht")) diff --git a/testcases/kernel/sched/hyperthreading/ht_enabled/HTutils.c b/testcases/kernel/sched/hyperthreading/ht_enabled/HTutils.c index 5e33114..9d6e1c0 100644 --- a/testcases/kernel/sched/hyperthreading/ht_enabled/HTutils.c +++ b/testcases/kernel/sched/hyperthreading/ht_enabled/HTutils.c @@ -60,7 +60,7 @@ int is_ht_kernel() inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx) { -#ifndef ARCH_i386 +#ifndef __i386__ return; #else __asm__("cpuid" diff --git a/testcases/kernel/sched/hyperthreading/ht_interrupt/HTinterrupt.c b/testcases/kernel/sched/hyperthreading/ht_interrupt/HTinterrupt.c index 0d04085..4207c6d 100644 --- a/testcases/kernel/sched/hyperthreading/ht_interrupt/HTinterrupt.c +++ b/testcases/kernel/sched/hyperthreading/ht_interrupt/HTinterrupt.c @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) { tst_resm(TINFO, "Begin: HyperThreading Interrupt"); -#ifndef ARCH_i386 +#ifndef __i386__ tst_brkm(TCONF, NULL, "This test suite can only excute on i386 architecture."); #else if (!check_ht_capability()) diff --git a/testcases/kernel/sched/hyperthreading/ht_interrupt/HTutils.c b/testcases/kernel/sched/hyperthreading/ht_interrupt/HTutils.c index 5e33114..9d6e1c0 100644 --- a/testcases/kernel/sched/hyperthreading/ht_interrupt/HTutils.c +++ b/testcases/kernel/sched/hyperthreading/ht_interrupt/HTutils.c @@ -60,7 +60,7 @@ int is_ht_kernel() inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx) { -#ifndef ARCH_i386 +#ifndef __i386__ return; #else __asm__("cpuid" -- 1.5.5.1 ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
