Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210330063923.2269702-1-wanjiabing@vivo.com>
In-Reply-To: <20210330063923.2269702-1-wanjiabing@vivo.com>
From:   "Rafael J. Wysocki" <rafael@kernel.org>
Date:   Thu, 8 Apr 2021 19:10:08 +0200
Message-ID: <CAJZ5v0huxxwVjbOo0wicMRQkx2vfj1Z6=B7OHTbuKFC2bazxDA@mail.gmail.com>
Subject: Re: [PATCH] linux/intel_rapl.h: Modify struct declaration
To:     Wan Jiabing <wanjiabing@vivo.com>
Cc:     "Rafael J. Wysocki" <rjw@rjwysocki.net>,
        Linux PM <linux-pm@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        kael_w@yeah.net
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, Mar 30, 2021 at 8:40 AM Wan Jiabing <wanjiabing@vivo.com> 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 <wanjiabing@vivo.com>
> ---
>  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!