From 918c9ee0e0554e6c0211807c72da0d05953490c7 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@linux.intel.com>
Date: Mon, 18 Aug 2008 09:06:01 +0200
Subject: [PATCH] --- yaml --- r: 108739 b: refs/heads/master c:
 1b72691ce35812ff865d778f303779e774d2b098 h: refs/heads/master i:   108737:
 e65078dd0a541269720fd5f7e83d54877a18649f   108735:
 11399d1f8ab0fd626b350f266ee23592bf5a8ebe v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/boot/boot.h   | 2 ++
 trunk/arch/x86/boot/memory.c | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a9c9e7d96c31..d3f9e2d64c43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f71066624d5d91bf179a1ea25da0800b72e20c60
+refs/heads/master: 1b72691ce35812ff865d778f303779e774d2b098
diff --git a/trunk/arch/x86/boot/boot.h b/trunk/arch/x86/boot/boot.h
index 616b804a2295..cc0ef13fba7a 100644
--- a/trunk/arch/x86/boot/boot.h
+++ b/trunk/arch/x86/boot/boot.h
@@ -30,6 +30,8 @@
 /* Useful macros */
 #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
 
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
+
 extern struct setup_header hdr;
 extern struct boot_params boot_params;
 
diff --git a/trunk/arch/x86/boot/memory.c b/trunk/arch/x86/boot/memory.c
index 53165c97336b..8c3c25f35578 100644
--- a/trunk/arch/x86/boot/memory.c
+++ b/trunk/arch/x86/boot/memory.c
@@ -13,7 +13,6 @@
  */
 
 #include "boot.h"
-#include <linux/kernel.h>
 
 #define SMAP	0x534d4150	/* ASCII "SMAP" */