summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-22 13:45:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-22 13:45:50 -0700
commita7e1aabb28e8154ce987b622fd78d80a1ca39361 (patch)
tree8671d8faf51d43665045b7362a177a23dc88921b /arch/x86/include
parent111ad119d1765b1bbef2629a5f2bd825caeb7e74 (diff)
parent996ba96a97f7406052486682846d68935a60e986 (diff)
downloadlinux-a7e1aabb28e8154ce987b622fd78d80a1ca39361.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: lguest: Fix in/out emulation lguest: Fix translation count about wikipedia's cpuid page lguest: Fix three simple typos in comments lguest: update comments lguest: Simplify device initialization. lguest: don't rewrite vmcall instructions lguest: remove remaining vmcall lguest: use a special 1:1 linear pagetable mode until first switch. lguest: Do not exit on non-fatal errors
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/lguest_hcall.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/lguest_hcall.h b/arch/x86/include/asm/lguest_hcall.h
index b60f2924c413..879fd7d33877 100644
--- a/arch/x86/include/asm/lguest_hcall.h
+++ b/arch/x86/include/asm/lguest_hcall.h
@@ -61,6 +61,7 @@ hcall(unsigned long call,
: "memory");
return call;
}
+/*:*/
/* Can't use our min() macro here: needs to be a constant */
#define LGUEST_IRQS (NR_IRQS < 32 ? NR_IRQS: 32)