Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Pull owner_id into release branch
+10
-10
+9
-9
drivers/acpi/utilities/utmisc.c
+9
-9
drivers/acpi/utilities/utmisc.c
···
84
84
85
85
/* Find a free owner ID */
86
86
87
-
for (i = 0; i < 32; i++) {
88
-
if (!(acpi_gbl_owner_id_mask & (1 << i))) {
87
+
for (i = 0; i < 64; i++) {
88
+
if (!(acpi_gbl_owner_id_mask & (1ULL << i))) {
89
89
ACPI_DEBUG_PRINT((ACPI_DB_VALUES,
90
-
"Current owner_id mask: %8.8X New ID: %2.2X\n",
90
+
"Current owner_id mask: %16.16LX New ID: %2.2X\n",
91
91
acpi_gbl_owner_id_mask,
92
92
(unsigned int)(i + 1)));
93
93
94
-
acpi_gbl_owner_id_mask |= (1 << i);
94
+
acpi_gbl_owner_id_mask |= (1ULL << i);
95
95
*owner_id = (acpi_owner_id) (i + 1);
96
96
goto exit;
97
97
}
···
106
106
*/
107
107
*owner_id = 0;
108
108
status = AE_OWNER_ID_LIMIT;
109
-
ACPI_REPORT_ERROR(("Could not allocate new owner_id (32 max), AE_OWNER_ID_LIMIT\n"));
109
+
ACPI_REPORT_ERROR(("Could not allocate new owner_id (64 max), AE_OWNER_ID_LIMIT\n"));
110
110
111
111
exit:
112
112
(void)acpi_ut_release_mutex(ACPI_MTX_CACHES);
···
123
123
* control method or unloading a table. Either way, we would
124
124
* ignore any error anyway.
125
125
*
126
-
* DESCRIPTION: Release a table or method owner ID. Valid IDs are 1 - 32
126
+
* DESCRIPTION: Release a table or method owner ID. Valid IDs are 1 - 64
127
127
*
128
128
******************************************************************************/
129
129
···
140
140
141
141
/* Zero is not a valid owner_iD */
142
142
143
-
if ((owner_id == 0) || (owner_id > 32)) {
143
+
if ((owner_id == 0) || (owner_id > 64)) {
144
144
ACPI_REPORT_ERROR(("Invalid owner_id: %2.2X\n", owner_id));
145
145
return_VOID;
146
146
}
···
158
158
159
159
/* Free the owner ID only if it is valid */
160
160
161
-
if (acpi_gbl_owner_id_mask & (1 << owner_id)) {
162
-
acpi_gbl_owner_id_mask ^= (1 << owner_id);
161
+
if (acpi_gbl_owner_id_mask & (1ULL << owner_id)) {
162
+
acpi_gbl_owner_id_mask ^= (1ULL << owner_id);
163
163
}
164
164
165
165
(void)acpi_ut_release_mutex(ACPI_MTX_CACHES);
+1
-1
include/acpi/acglobal.h
+1
-1
include/acpi/acglobal.h
···
211
211
ACPI_EXTERN u32 acpi_gbl_rsdp_original_location;
212
212
ACPI_EXTERN u32 acpi_gbl_ns_lookup_count;
213
213
ACPI_EXTERN u32 acpi_gbl_ps_find_count;
214
-
ACPI_EXTERN u32 acpi_gbl_owner_id_mask;
214
+
ACPI_EXTERN u64 acpi_gbl_owner_id_mask;
215
215
ACPI_EXTERN u16 acpi_gbl_pm1_enable_register_save;
216
216
ACPI_EXTERN u16 acpi_gbl_global_lock_handle;
217
217
ACPI_EXTERN u8 acpi_gbl_debugger_configuration;