diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 15:13:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 15:13:20 -0400 |
| commit | f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c (patch) | |
| tree | c5643fcdc884a8d0bfc3f1bc28039cab7394e5bc /include/xen/xen-ops.h | |
| parent | 323ec001c6bb98eeabb5abbdbb8c8055d9496554 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/xen/xen-ops.h')
| -rw-r--r-- | include/xen/xen-ops.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index 10ddfe0142d0..a706d6a78960 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h | |||
| @@ -5,4 +5,10 @@ | |||
| 5 | 5 | ||
| 6 | DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu); | 6 | DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu); |
| 7 | 7 | ||
| 8 | void xen_pre_suspend(void); | ||
| 9 | void xen_post_suspend(int suspend_cancelled); | ||
| 10 | |||
| 11 | void xen_mm_pin_all(void); | ||
| 12 | void xen_mm_unpin_all(void); | ||
| 13 | |||
| 8 | #endif /* INCLUDE_XEN_OPS_H */ | 14 | #endif /* INCLUDE_XEN_OPS_H */ |