diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-03-03 18:26:43 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-03-03 18:26:43 +0100 |
| commit | 5719638d368f35934d53e4a8c3a2f007c32a1ecf (patch) | |
| tree | e5134298a1e7563a67ae09421be0bf1dd9b6e7cf | |
| parent | f43523620f646c89ffd8ada840a0068290e51266 (diff) | |
| parent | d25d01b4e59bde815df52a333f9b0f7558cc3281 (diff) | |
| download | lwn-5719638d368f35934d53e4a8c3a2f007c32a1ecf.tar.gz lwn-5719638d368f35934d53e4a8c3a2f007c32a1ecf.zip | |
Merge branch 'powercap'
Merge additional power capping changes for 6.3-rc1:
- Remove MODULE_LICENSE from non-modular power capping code (Nick
Alcock).
- Add Add Power Limit4 support for Meteor Lake SoC to the Intel RAPL
power capping driver (Sumeet Pawnikar).
* powercap:
powercap: remove MODULE_LICENSE in non-modules
powercap: RAPL: Add Power Limit4 support for Meteor Lake SoC
| -rw-r--r-- | drivers/powercap/intel_rapl_msr.c | 2 | ||||
| -rw-r--r-- | drivers/powercap/powercap_sys.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/powercap/intel_rapl_msr.c b/drivers/powercap/intel_rapl_msr.c index bc6adda58883..a27673706c3d 100644 --- a/drivers/powercap/intel_rapl_msr.c +++ b/drivers/powercap/intel_rapl_msr.c @@ -143,6 +143,8 @@ static const struct x86_cpu_id pl4_support_ids[] = { { X86_VENDOR_INTEL, 6, INTEL_FAM6_ALDERLAKE_N, X86_FEATURE_ANY }, { X86_VENDOR_INTEL, 6, INTEL_FAM6_RAPTORLAKE, X86_FEATURE_ANY }, { X86_VENDOR_INTEL, 6, INTEL_FAM6_RAPTORLAKE_P, X86_FEATURE_ANY }, + { X86_VENDOR_INTEL, 6, INTEL_FAM6_METEORLAKE, X86_FEATURE_ANY }, + { X86_VENDOR_INTEL, 6, INTEL_FAM6_METEORLAKE_L, X86_FEATURE_ANY }, {} }; diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c index e180dee0f83d..52c32dcbf7d8 100644 --- a/drivers/powercap/powercap_sys.c +++ b/drivers/powercap/powercap_sys.c @@ -679,4 +679,3 @@ fs_initcall(powercap_init); MODULE_DESCRIPTION("PowerCap sysfs Driver"); MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>"); -MODULE_LICENSE("GPL v2"); |