summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2008-06-12 10:27:08 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-12 11:14:58 +0200
commitbf07dc864902b3e788de5ab50dc62d5677da90f2 (patch)
tree9eb0126d3868990b5620087e555140ff940b1cab
parent5b80fe8bd732b5dd442118a43e02db22e8fd93e2 (diff)
downloadblackbird-op-linux-bf07dc864902b3e788de5ab50dc62d5677da90f2.tar.gz
blackbird-op-linux-bf07dc864902b3e788de5ab50dc62d5677da90f2.zip
x86: remove obsolete PM definitions from NMI header
Remove obsolete and no longer used PM-related definitions from include/asm-x86/nmi.h. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/asm-x86/nmi.h21
1 files changed, 0 insertions, 21 deletions
diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h
index 8455bf36d8df..621bd090c1fb 100644
--- a/include/asm-x86/nmi.h
+++ b/include/asm-x86/nmi.h
@@ -15,27 +15,6 @@
*/
int do_nmi_callback(struct pt_regs *regs, int cpu);
-#ifdef CONFIG_PM
-
-/** Replace the PM callback routine for NMI. */
-struct pm_dev *set_nmi_pm_callback(pm_callback callback);
-
-/** Unset the PM callback routine back to the default. */
-void unset_nmi_pm_callback(struct pm_dev *dev);
-
-#else
-
-static inline struct pm_dev *set_nmi_pm_callback(pm_callback callback)
-{
- return 0;
-}
-
-static inline void unset_nmi_pm_callback(struct pm_dev *dev)
-{
-}
-
-#endif /* CONFIG_PM */
-
#ifdef CONFIG_X86_64
extern void default_do_nmi(struct pt_regs *);
extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
OpenPOWER on IntegriCloud