diff options
author | Tony Luck <tony.luck@intel.com> | 2010-02-26 15:04:22 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2010-02-26 15:04:22 -0500 |
commit | 65c9bb6cca78a3677c66c6b279d5d77aa863bb32 (patch) | |
tree | 626345aac319521905213bf249554c0c7aaa44d6 /arch/ia64/kernel/process.c | |
parent | 8d6339b8a532ec4eeb31db321cf1e6068965deda (diff) | |
parent | e72aca30837d9c0ee287d18a092fc76a38a3b81d (diff) |
Pull alex into release branch
Diffstat (limited to 'arch/ia64/kernel/process.c')
-rw-r--r-- | arch/ia64/kernel/process.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index 883ecc9cfef5..d92765cae10a 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c | |||
@@ -59,6 +59,10 @@ unsigned long idle_halt; | |||
59 | EXPORT_SYMBOL(idle_halt); | 59 | EXPORT_SYMBOL(idle_halt); |
60 | unsigned long idle_nomwait; | 60 | unsigned long idle_nomwait; |
61 | EXPORT_SYMBOL(idle_nomwait); | 61 | EXPORT_SYMBOL(idle_nomwait); |
62 | void (*pm_idle) (void); | ||
63 | EXPORT_SYMBOL(pm_idle); | ||
64 | void (*pm_power_off) (void); | ||
65 | EXPORT_SYMBOL(pm_power_off); | ||
62 | 66 | ||
63 | void | 67 | void |
64 | ia64_do_show_stack (struct unw_frame_info *info, void *arg) | 68 | ia64_do_show_stack (struct unw_frame_info *info, void *arg) |