From 804076841da8a465c2b279ca4ff589bc28c18be0 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt.fleming@intel.com>
Date: Tue, 15 Nov 2011 12:57:03 +0000
Subject: [PATCH] --- yaml --- r: 283532 b: refs/heads/master c:
 bb05e4ba452ada7966fbced4e829aa029f546445 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/efi.h | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d2df19b5bebe..5c12ac9a6c71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e84f345e2f2189a37492c77c566c7494b7b6b23
+refs/heads/master: bb05e4ba452ada7966fbced4e829aa029f546445
diff --git a/trunk/include/linux/efi.h b/trunk/include/linux/efi.h
index e35005f451db..378f2cd1f7c3 100644
--- a/trunk/include/linux/efi.h
+++ b/trunk/include/linux/efi.h
@@ -109,6 +109,14 @@ typedef struct {
 	u32 imagesize;
 } efi_capsule_header_t;
 
+/*
+ * Allocation types for calls to boottime->allocate_pages.
+ */
+#define EFI_ALLOCATE_ANY_PAGES		0
+#define EFI_ALLOCATE_MAX_ADDRESS	1
+#define EFI_ALLOCATE_ADDRESS		2
+#define EFI_MAX_ALLOCATE_TYPE		3
+
 typedef int (*efi_freemem_callback_t) (u64 start, u64 end, void *arg);
 
 /*