From cbf508e92ce5330d4b3be8b275a8dc2d06c2cc46 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 25 Jun 2008 00:19:17 -0400
Subject: [PATCH] --- yaml --- r: 99951 b: refs/heads/master c:
 408011759cc8ff7f89505e8398cec0ccf67b5afa h: refs/heads/master i:   99949:
 68dc891a4daa8d0f9e4e53caf01c896e15cf4f0e   99947:
 026c2a791b8488b40a15fccf2e54315f5ae1bb2c   99943:
 00d5bba6a1259890ff4abdd8f90c7cec46d5a94a   99935:
 83f400e559ffc94229fc10235c5432f04a529856 v: v3

---
 [refs]                            | 2 +-
 trunk/include/asm-x86/fixmap_64.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b35e8d5f76fd..0319d55072c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6523748bddd38bcec11431f57502090b6014a96
+refs/heads/master: 408011759cc8ff7f89505e8398cec0ccf67b5afa
diff --git a/trunk/include/asm-x86/fixmap_64.h b/trunk/include/asm-x86/fixmap_64.h
index c7dcc365f470..1a0b61eb02ff 100644
--- a/trunk/include/asm-x86/fixmap_64.h
+++ b/trunk/include/asm-x86/fixmap_64.h
@@ -46,6 +46,9 @@ enum fixed_addresses {
 	FIX_EFI_IO_MAP_LAST_PAGE,
 	FIX_EFI_IO_MAP_FIRST_PAGE = FIX_EFI_IO_MAP_LAST_PAGE
 				  + MAX_EFI_IO_PAGES - 1,
+#ifdef CONFIG_PARAVIRT
+	FIX_PARAVIRT_BOOTMAP,
+#endif
 #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
 	FIX_OHCI1394_BASE,
 #endif