[LTP] [PATCH] fix glb_run type for disktest

[LTP] [PATCH] fix glb_run type for disktest

[Jeffrey Bastian]

disktest/main.c and disktest/timer.c fail to compile on certain
platforms due to mismatch in types -- short vs long -- with a
gcc error "relocation truncated to fit"

Thanks to Kyle McMartin for the hint on how to fix the error!
---
 testcases/kernel/io/disktest/main.c  | 2 +-
 testcases/kernel/io/disktest/timer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testcases/kernel/io/disktest/main.c b/testcases/kernel/io/disktest/main.c
index 5e5b91a37a12..9484ec103601 100644
--- a/testcases/kernel/io/disktest/main.c
+++ b/testcases/kernel/io/disktest/main.c
@@ -290,7 +290,7 @@ void *threadedMain(void *vtest)
 	int i;
 	unsigned char *sharedMem;
 
-	extern unsigned long glb_run;
+	extern unsigned short glb_run;
 	extern int signal_action;
 
 	test->args->pid = GETPID();
diff --git a/testcases/kernel/io/disktest/timer.c b/testcases/kernel/io/disktest/timer.c
index 45ae09f17b38..f47fa7dde496 100644
--- a/testcases/kernel/io/disktest/timer.c
+++ b/testcases/kernel/io/disktest/timer.c
@@ -86,7 +86,7 @@ void *ChildTimer(void *vtest)
 	test_env_t *env = test->env;
 
 	extern int signal_action;
-	extern unsigned long glb_run;
+	extern unsigned short glb_run;
 
 #ifdef _DEBUG
 	PDBG3(DBUG, args, "In timer %lu, %d\n", time(NULL), env->bContinue);
-- 
1.8.3.1


------------------------------------------------------------------------------
WatchGuard Dimension instantly turns raw network data into actionable 
security intelligence. It gives you real-time visual feedback on key
security issues and trends.  Skip the complicated setup - simply import
a virtual appliance and go from zero to informed in seconds.
http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] fix glb_run type for disktest

[Jan Stancek]

----- Original Message -----
> From: "Jeffrey Bastian" <jbastian@redhat.com>
> To: ltp-list@lists.sourceforge.net
> Sent: Wednesday, 29 January, 2014 11:43:07 PM
> Subject: [LTP] [PATCH] fix glb_run type for disktest
> 
> disktest/main.c and disktest/timer.c fail to compile on certain
> platforms due to mismatch in types -- short vs long -- with a
> gcc error "relocation truncated to fit"
> 
> Thanks to Kyle McMartin for the hint on how to fix the error!
> ---

Hi Jeff,

pushed with added "Signed-off-by" line.

Regards,
Jan

>  testcases/kernel/io/disktest/main.c  | 2 +-
>  testcases/kernel/io/disktest/timer.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/testcases/kernel/io/disktest/main.c
> b/testcases/kernel/io/disktest/main.c
> index 5e5b91a37a12..9484ec103601 100644
> --- a/testcases/kernel/io/disktest/main.c
> +++ b/testcases/kernel/io/disktest/main.c
> @@ -290,7 +290,7 @@ void *threadedMain(void *vtest)
>  	int i;
>  	unsigned char *sharedMem;
>  
> -	extern unsigned long glb_run;
> +	extern unsigned short glb_run;
>  	extern int signal_action;
>  
>  	test->args->pid = GETPID();
> diff --git a/testcases/kernel/io/disktest/timer.c
> b/testcases/kernel/io/disktest/timer.c
> index 45ae09f17b38..f47fa7dde496 100644
> --- a/testcases/kernel/io/disktest/timer.c
> +++ b/testcases/kernel/io/disktest/timer.c
> @@ -86,7 +86,7 @@ void *ChildTimer(void *vtest)
>  	test_env_t *env = test->env;
>  
>  	extern int signal_action;
> -	extern unsigned long glb_run;
> +	extern unsigned short glb_run;
>  
>  #ifdef _DEBUG
>  	PDBG3(DBUG, args, "In timer %lu, %d\n", time(NULL), env->bContinue);
> --
> 1.8.3.1
> 
> 
> ------------------------------------------------------------------------------
> WatchGuard Dimension instantly turns raw network data into actionable
> security intelligence. It gives you real-time visual feedback on key
> security issues and trends.  Skip the complicated setup - simply import
> a virtual appliance and go from zero to informed in seconds.
> http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
> _______________________________________________
> Ltp-list mailing list
> Ltp-list@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/ltp-list
> 

------------------------------------------------------------------------------
WatchGuard Dimension instantly turns raw network data into actionable 
security intelligence. It gives you real-time visual feedback on key
security issues and trends.  Skip the complicated setup - simply import
a virtual appliance and go from zero to informed in seconds.
http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list