Skip to content

Commit 3a616ec

Browse files
committed
Merge branches 'acpi-prm', 'acpi-sysfs' and 'acpi-x86'
* acpi-prm: ACPI: PRM: make symbol 'prm_module_list' static ACPI: Add \_SB._OSC bit for PRM ACPI: PRM: implement OperationRegion handler for the PlatformRtMechanism subtype * acpi-sysfs: ACPI: sysfs: Remove tailing return statement in void function ACPI: sysfs: Use __ATTR_RO() and __ATTR_RW() macros ACPI: sysfs: Sort headers alphabetically ACPI: sysfs: Refactor param_get_trace_state() to drop dead code ACPI: sysfs: Unify pattern of memory allocations ACPI: sysfs: Allow bitmap list to be supplied to acpi_mask_gpe ACPI: sysfs: Make sparse happy about address space in use ACPI: sysfs: fix doc warnings in device_sysfs.c ACPI: sysfs: Drop four redundant return statements ACPI: sysfs: Fix a buffer overrun problem with description_show() * acpi-x86: x86/acpi: Switch to pr_xxx log functions
4 parents 2f4edfa + d7a188b + df35ee7 + 14fad24 commit 3a616ec

File tree

11 files changed

+413
-121
lines changed

11 files changed

+413
-121
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
the GPE dispatcher.
114114
This facility can be used to prevent such uncontrolled
115115
GPE floodings.
116-
Format: <byte>
116+
Format: <byte> or <bitmap-list>
117117

118118
acpi_no_auto_serialize [HW,ACPI]
119119
Disable auto-serialization of AML methods

0 commit comments

Comments
 (0)