diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 06:10:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 06:10:50 -0400 |
commit | 35780c8ea7ad5c6d5483244d5f5bf37176fda86a (patch) | |
tree | 2bc34969f558da2a9b3de915e3f2499a959085da /arch/sh/kernel/process_64.c | |
parent | 6ce37a58e334ef773f88283939afc9f4965c7697 (diff) | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) |
Merge commit 'v2.6.27-rc1' into x86/urgent
Diffstat (limited to 'arch/sh/kernel/process_64.c')
-rw-r--r-- | arch/sh/kernel/process_64.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c index 0283d8133075..b9dbd2d3b4a5 100644 --- a/arch/sh/kernel/process_64.c +++ b/arch/sh/kernel/process_64.c | |||
@@ -36,16 +36,6 @@ static int hlt_counter = 1; | |||
36 | 36 | ||
37 | #define HARD_IDLE_TIMEOUT (HZ / 3) | 37 | #define HARD_IDLE_TIMEOUT (HZ / 3) |
38 | 38 | ||
39 | void disable_hlt(void) | ||
40 | { | ||
41 | hlt_counter++; | ||
42 | } | ||
43 | |||
44 | void enable_hlt(void) | ||
45 | { | ||
46 | hlt_counter--; | ||
47 | } | ||
48 | |||
49 | static int __init nohlt_setup(char *__unused) | 39 | static int __init nohlt_setup(char *__unused) |
50 | { | 40 | { |
51 | hlt_counter = 1; | 41 | hlt_counter = 1; |