From: Wan Jiabing <wanjiabing@vivo.com>
Date: Tue, 30 Mar 2021 06:39:23 +0000 (+0800)
Subject: powercap: RAPL: Fix struct declaration in header file
X-Git-Tag: xarray-5.18~2057^2~3^6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=35eb1f5033cf301bda48a22f2edcaed2fda70bfd;p=users%2Fwilly%2Fxarray.git

powercap: RAPL: Fix struct declaration in header file

struct rapl_package is declared twice in intel_rapl.h, once at line 80
and once earlier.

Code inspection suggests that the first instance should be struct
rapl_domain rather than rapl_package, so change it.

Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
[ rjw: Subject and changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

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,