[PATCH] powerpc: Remove leftover cputime_to_nsecs call causing build error

[PATCH] powerpc: Remove leftover cputime_to_nsecs call causing build error

[Frederic Weisbecker]

This type conversion is a leftover that got ignored during the kcpustat
conversion to nanosecs, resulting in build breakage with config having
CONFIG_NO_HZ_FULL=y.

	arch/powerpc/kernel/time.c: In function 'running_clock':
	arch/powerpc/kernel/time.c:712:2: error: implicit declaration of function 'cputime_to_nsecs' [-Werror=implicit-function-declaration]
	  return local_clock() - cputime_to_nsecs(kcpustat_this_cpu->cpustat[CPUTIME_STEAL]);

All we need is to remove it.

Reported-by: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Oliver O'Halloran <oohall@gmail.com>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
---
 arch/powerpc/kernel/time.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 14e4855..bc84a8d 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -709,7 +709,7 @@ unsigned long long running_clock(void)
 	 * time and on a host which doesn't do any virtualisation TB *should* equal
 	 * VTB so it makes no difference anyway.
 	 */
-	return local_clock() - cputime_to_nsecs(kcpustat_this_cpu->cpustat[CPUTIME_STEAL]);
+	return local_clock() - kcpustat_this_cpu->cpustat[CPUTIME_STEAL];
 }
 #endif
 
-- 
2.7.4

Re: [PATCH] powerpc: Remove leftover cputime_to_nsecs call causing build error

[Michael Ellerman]

Frederic Weisbecker <fweisbec@gmail.com> writes:

> This type conversion is a leftover that got ignored during the kcpustat
> conversion to nanosecs, resulting in build breakage with config having
> CONFIG_NO_HZ_FULL=y.
>
> 	arch/powerpc/kernel/time.c: In function 'running_clock':
> 	arch/powerpc/kernel/time.c:712:2: error: implicit declaration of function 'cputime_to_nsecs' [-Werror=implicit-function-declaration]
> 	  return local_clock() - cputime_to_nsecs(kcpustat_this_cpu->cpustat[CPUTIME_STEAL]);
>
> All we need is to remove it.
>
> Reported-by: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Oliver O'Halloran <oohall@gmail.com>
> Cc: linuxppc-dev@lists.ozlabs.org
> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>

LGTM.

Acked-by: Michael Ellerman <mpe@ellerman.id.au>


Are you going to send this to Linus, or should I?

cheers


> diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
> index 14e4855..bc84a8d 100644
> --- a/arch/powerpc/kernel/time.c
> +++ b/arch/powerpc/kernel/time.c
> @@ -709,7 +709,7 @@ unsigned long long running_clock(void)
>  	 * time and on a host which doesn't do any virtualisation TB *should* equal
>  	 * VTB so it makes no difference anyway.
>  	 */
> -	return local_clock() - cputime_to_nsecs(kcpustat_this_cpu->cpustat[CPUTIME_STEAL]);
> +	return local_clock() - kcpustat_this_cpu->cpustat[CPUTIME_STEAL];
>  }
>  #endif
>  
> -- 
> 2.7.4

Re: [PATCH] powerpc: Remove leftover cputime_to_nsecs call causing build error

[Frederic Weisbecker]

On Thu, Feb 23, 2017 at 08:34:15AM +1100, Michael Ellerman wrote:
> Frederic Weisbecker <fweisbec@gmail.com> writes:
> 
> > This type conversion is a leftover that got ignored during the kcpustat
> > conversion to nanosecs, resulting in build breakage with config having
> > CONFIG_NO_HZ_FULL=y.
> >
> > 	arch/powerpc/kernel/time.c: In function 'running_clock':
> > 	arch/powerpc/kernel/time.c:712:2: error: implicit declaration of function 'cputime_to_nsecs' [-Werror=implicit-function-declaration]
> > 	  return local_clock() - cputime_to_nsecs(kcpustat_this_cpu->cpustat[CPUTIME_STEAL]);
> >
> > All we need is to remove it.
> >
> > Reported-by: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
> > Cc: Michael Ellerman <mpe@ellerman.id.au>
> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> > Cc: Paul Mackerras <paulus@samba.org>
> > Cc: Oliver O'Halloran <oohall@gmail.com>
> > Cc: linuxppc-dev@lists.ozlabs.org
> > Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
> 
> LGTM.
> 
> Acked-by: Michael Ellerman <mpe@ellerman.id.au>
> 
> 
> Are you going to send this to Linus, or should I?

I would prefer you send it to Linus if you don't mind.

The fate of a powerpc patch sent by me directly to Linus is
anything but predictable :o)

Thanks.

Re: powerpc: Remove leftover cputime_to_nsecs call causing build error

[Michael Ellerman]

On Tue, 2017-02-21 at 15:18:41 UTC, =?utf-8?b?RnLDqWTDqXJpYyBXZWlzYmVja2Vy?= wrote:
> This type conversion is a leftover that got ignored during the kcpustat
> conversion to nanosecs, resulting in build breakage with config having
> CONFIG_NO_HZ_FULL=y.
> 
> 	arch/powerpc/kernel/time.c: In function 'running_clock':
> 	arch/powerpc/kernel/time.c:712:2: error: implicit declaration of function 'cputime_to_nsecs' [-Werror=implicit-function-declaration]
> 	  return local_clock() - cputime_to_nsecs(kcpustat_this_cpu->cpustat[CPUTIME_STEAL]);
> 
> All we need is to remove it.
> 
> Reported-by: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Oliver O'Halloran <oohall@gmail.com>
> Cc: linuxppc-dev@lists.ozlabs.org
> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/9f3768e02335ddd6ebe1d85d5cb3a6

cheers