summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-10-15 16:22:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-10-15 16:22:11 -0700
commit36704263f1f466f7eb6f237e97f4ec15473980fc (patch)
tree139b84f5859a16df53138e28bc79434fdf82f903 /drivers/char
parent1e52db6908ca5aa8e035caeaf96e8de2567fd84d (diff)
parent7cde9b27e7b3a2e09d647bb4f6d94e842698d2d5 (diff)
downloadlinux-36704263f1f466f7eb6f237e97f4ec15473980fc.tar.bz2
Merge tag 'stable/for-linus-3.12-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen fixes from Stefano Stabellini: "A small fix for Xen on x86_32 and a build fix for xen-tpmfront on arm64" * tag 'stable/for-linus-3.12-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen: Fix possible user space selector corruption tpm: xen-tpmfront: fix missing declaration of xen_domain
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/tpm/xen-tpmfront.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c
index 06189e55b4e5..94c280d36e8b 100644
--- a/drivers/char/tpm/xen-tpmfront.c
+++ b/drivers/char/tpm/xen-tpmfront.c
@@ -10,6 +10,7 @@
#include <linux/errno.h>
#include <linux/err.h>
#include <linux/interrupt.h>
+#include <xen/xen.h>
#include <xen/events.h>
#include <xen/interface/io/tpmif.h>
#include <xen/grant_table.h>