Re: linux-next: build failure after merge of the pm tree

Rafael J. Wysocki
2019-07-15T09:44:53Z

Hi Stephen,

On Monday, July 15, 2019 2:02:36 AM CEST Stephen Rothwell wrote:
>
> --Sig_/JvAwh/r3+t+V+F.+O2706e.
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi all,
>
> After merging the pm tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> In file included from <command-line>:
> include/linux/intel_rapl.h:116:19: error: field 'pcap_rapl_online' has inco=
> mplete type
> enum cpuhp_state pcap_rapl_online;
> ^~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 7ebf8eff63b4 ("intel_rapl: introduce struct rapl_if_private")
>
> This was detected by the new test that attempts to build each include
> file standalone.
>
> I have added the following fix patch for today:

I've applied this patch on top of the RAPL series and added it to my linux-next branch.

Thanks!

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 15 Jul 2019 09:56:30 +1000
> Subject: [PATCH] intel_rapl: need linux/cpuhotplug.h for enum cpuhp_state
>
> Fixes: 7ebf8eff63b4 ("intel_rapl: introduce struct rapl_if_private")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> include/linux/intel_rapl.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/include/linux/intel_rapl.h b/include/linux/intel_rapl.h
> index 0c179d92d110..efb3ce892c20 100644
> --- a/include/linux/intel_rapl.h
> +++ b/include/linux/intel_rapl.h
> @@ -12,6 +12,7 @@
> =20
> #include <linux/types.h>
> #include <linux/powercap.h>
> +#include <linux/cpuhotplug.h>
> =20
> enum rapl_domain_type {
> RAPL_DOMAIN_PACKAGE, /* entire package/socket */
> --=20
> 2.20.1
>
> --=20
> Cheers,
> Stephen Rothwell
>
> --Sig_/JvAwh/r3+t+V+F.+O2706e.
> Content-Type: application/pgp-signature
> Content-Description: OpenPGP digital signature
>
>
> --Sig_/JvAwh/r3+t+V+F.+O2706e.--
>