2021-03-30 06:41:14

by Jiabing Wan

Subject: [PATCH] linux/intel_rapl.h: Modify struct declaration

struct rapl_package is declared twice. One has been declared
at 80th line.
By reviewing the code, it should declare struct rapl_domain
rather than rapl_package. Modify it.

Signed-off-by: Wan Jiabing <[email protected]>
---
include/linux/intel_rapl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/intel_rapl.h b/include/linux/intel_rapl.h
index 50b8398ffd21..93780834fc8f 100644
--- a/include/linux/intel_rapl.h
+++ b/include/linux/intel_rapl.h
@@ -33,7 +33,7 @@ enum rapl_domain_reg_id {
RAPL_DOMAIN_REG_MAX,
};

-struct rapl_package;
+struct rapl_domain;

enum rapl_primitives {
ENERGY_COUNTER,
--
2.25.1

2021-04-08 17:11:50

by Rafael J. Wysocki

Subject: Re: [PATCH] linux/intel_rapl.h: Modify struct declaration

On Tue, Mar 30, 2021 at 8:40 AM Wan Jiabing <[email protected]> wrote:
>
> struct rapl_package is declared twice. One has been declared
> at 80th line.
> By reviewing the code, it should declare struct rapl_domain
> rather than rapl_package. Modify it.
>
> Signed-off-by: Wan Jiabing <[email protected]>
> ---
> include/linux/intel_rapl.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/intel_rapl.h b/include/linux/intel_rapl.h
> index 50b8398ffd21..93780834fc8f 100644
> --- a/include/linux/intel_rapl.h
> +++ b/include/linux/intel_rapl.h
> @@ -33,7 +33,7 @@ enum rapl_domain_reg_id {
> RAPL_DOMAIN_REG_MAX,
> };
>
> -struct rapl_package;
> +struct rapl_domain;
>
> enum rapl_primitives {
> ENERGY_COUNTER,
> --

Applied as 5.13 material with edited subject and changelog, thanks!