diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:54:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:54:49 -0400 |
| commit | d1a76187a5be4f89c6cb19d800cb5fb7aac735c5 (patch) | |
| tree | 2fac3ffbfffc7560eeef8364b541d0d7a0057920 /arch/x86/include/asm/therm_throt.h | |
| parent | c7e78cff6b7518212247fb20b1dc6411540dc9af (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into core/locking
Conflicts:
arch/um/include/asm/system.h
Diffstat (limited to 'arch/x86/include/asm/therm_throt.h')
| -rw-r--r-- | arch/x86/include/asm/therm_throt.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/include/asm/therm_throt.h b/arch/x86/include/asm/therm_throt.h new file mode 100644 index 000000000000..c62349ee7860 --- /dev/null +++ b/arch/x86/include/asm/therm_throt.h | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | #ifndef _ASM_X86_THERM_THROT_H | ||
| 2 | #define _ASM_X86_THERM_THROT_H | ||
| 3 | |||
| 4 | #include <asm/atomic.h> | ||
| 5 | |||
| 6 | extern atomic_t therm_throt_en; | ||
| 7 | int therm_throt_process(int curr); | ||
| 8 | |||
| 9 | #endif /* _ASM_X86_THERM_THROT_H */ | ||