lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'release' and 'stats' into release

Browse Source
This commit is contained in:
Len Brown
2008-02-07 03:13:36 -05:00
parent 70ec75c5b8 5229e87d59
commit e5e54bc86a
9 changed files with 325 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/events/evevent.c
View File

@@ -259,7 +259,7 @@ u32 acpi_ev_fixed_event_detect(void)
enable_bit_mask)) {
/* Found an active (signalled) event */
acpi_os_fixed_event_count(i);
int_status |= acpi_ev_fixed_event_dispatch((u32) i);
}
}

2
drivers/acpi/events/evgpe.c
View File

@@ -627,7 +627,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
ACPI_FUNCTION_TRACE(ev_gpe_dispatch);
acpi_gpe_count++;
acpi_os_gpe_count(gpe_number);
/*
* If edge-triggered, clear the GPE status bit now. Note that