diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
| commit | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (patch) | |
| tree | 316436f77dac75335fd2c3ef5f109e71606c50d3 /include/xen/xen-ops.h | |
| parent | b6d4f7e3ef25beb8c658c97867d98883e69dc544 (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/xen/xen-ops.h')
| -rw-r--r-- | include/xen/xen-ops.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index a706d6a78960..883a21bba24b 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h | |||
| @@ -11,4 +11,7 @@ void xen_post_suspend(int suspend_cancelled); | |||
| 11 | void xen_mm_pin_all(void); | 11 | void xen_mm_pin_all(void); |
| 12 | void xen_mm_unpin_all(void); | 12 | void xen_mm_unpin_all(void); |
| 13 | 13 | ||
| 14 | void xen_timer_resume(void); | ||
| 15 | void xen_arch_resume(void); | ||
| 16 | |||
| 14 | #endif /* INCLUDE_XEN_OPS_H */ | 17 | #endif /* INCLUDE_XEN_OPS_H */ |