diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 19:03:13 +0000 | 
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 19:03:13 +0000 | 
| commit | 5c34202b8bf942da411b6599668a76b07449bbfd (patch) | |
| tree | 5719c361321eaddc8e4f1b0c8a7994f0e9a6fdd3 /drivers/acpi/processor_idle.c | |
| parent | 0d4804b31f91cfbcff6d62af0bc09a893a1c8ae0 (diff) | |
| parent | 1f8a6b658a943b4f04a1fc7b3a420360202c86cd (diff) | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/acpi/processor_idle.c')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index ae0654cd11e..ee5759bef94 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -475,7 +475,7 @@ static void acpi_processor_idle(void)  #ifdef CONFIG_GENERIC_TIME  		/* TSC halts in C2, so notify users */ -		mark_tsc_unstable(); +		mark_tsc_unstable("possible TSC halt in C2");  #endif  		/* Re-enable interrupts */  		local_irq_enable(); @@ -517,7 +517,7 @@ static void acpi_processor_idle(void)  #ifdef CONFIG_GENERIC_TIME  		/* TSC halts in C3, so notify users */ -		mark_tsc_unstable(); +		mark_tsc_unstable("TSC halts in C3");  #endif  		/* Re-enable interrupts */  		local_irq_enable();  | 
