diff options
Diffstat (limited to 'drivers/acpi/utilities/utxface.c')
-rw-r--r-- | drivers/acpi/utilities/utxface.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c index a92d91277ef9..f8bdadf3c32f 100644 --- a/drivers/acpi/utilities/utxface.c +++ b/drivers/acpi/utilities/utxface.c | |||
@@ -193,24 +193,6 @@ acpi_status acpi_enable_subsystem(u32 flags) | |||
193 | } | 193 | } |
194 | } | 194 | } |
195 | 195 | ||
196 | /* | ||
197 | * Complete the GPE initialization for the GPE blocks defined in the FADT | ||
198 | * (GPE block 0 and 1). | ||
199 | * | ||
200 | * Note1: This is where the _PRW methods are executed for the GPEs. These | ||
201 | * methods can only be executed after the SCI and Global Lock handlers are | ||
202 | * installed and initialized. | ||
203 | * | ||
204 | * Note2: Currently, there seems to be no need to run the _REG methods | ||
205 | * before execution of the _PRW methods and enabling of the GPEs. | ||
206 | */ | ||
207 | if (!(flags & ACPI_NO_EVENT_INIT)) { | ||
208 | status = acpi_ev_install_fadt_gpes(); | ||
209 | if (ACPI_FAILURE(status)) { | ||
210 | return (status); | ||
211 | } | ||
212 | } | ||
213 | |||
214 | return_ACPI_STATUS(status); | 196 | return_ACPI_STATUS(status); |
215 | } | 197 | } |
216 | 198 | ||
@@ -281,6 +263,23 @@ acpi_status acpi_initialize_objects(u32 flags) | |||
281 | } | 263 | } |
282 | 264 | ||
283 | /* | 265 | /* |
266 | * Complete the GPE initialization for the GPE blocks defined in the FADT | ||
267 | * (GPE block 0 and 1). | ||
268 | * | ||
269 | * Note1: This is where the _PRW methods are executed for the GPEs. These | ||
270 | * methods can only be executed after the SCI and Global Lock handlers are | ||
271 | * installed and initialized. | ||
272 | * | ||
273 | * Note2: Currently, there seems to be no need to run the _REG methods | ||
274 | * before execution of the _PRW methods and enabling of the GPEs. | ||
275 | */ | ||
276 | if (!(flags & ACPI_NO_EVENT_INIT)) { | ||
277 | status = acpi_ev_install_fadt_gpes(); | ||
278 | if (ACPI_FAILURE(status)) | ||
279 | return (status); | ||
280 | } | ||
281 | |||
282 | /* | ||
284 | * Empty the caches (delete the cached objects) on the assumption that | 283 | * Empty the caches (delete the cached objects) on the assumption that |
285 | * the table load filled them up more than they will be at runtime -- | 284 | * the table load filled them up more than they will be at runtime -- |
286 | * thus wasting non-paged memory. | 285 | * thus wasting non-paged memory. |