diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 15:08:05 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 15:08:18 +0200 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /include/trace/events/xen.h | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'include/trace/events/xen.h')
| -rw-r--r-- | include/trace/events/xen.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/trace/events/xen.h b/include/trace/events/xen.h index 44d8decee09..92f1a796829 100644 --- a/include/trace/events/xen.h +++ b/include/trace/events/xen.h @@ -8,6 +8,8 @@ #include <asm/paravirt_types.h> #include <asm/xen/trace_types.h> +struct multicall_entry; + /* Multicalls */ DECLARE_EVENT_CLASS(xen_mc__batch, TP_PROTO(enum paravirt_lazy_mode mode), |