---

yaml --- r: 108739 b: refs/heads/master c: 1b72691 h: refs/heads/master i: 108737: e65078d 108735: 11399d1 v: v3
git-mirror · Aug 18, 2008 · 918c9ee · 918c9ee
1 parent 3150176
commit 918c9ee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -13,7 +13,6 @@
  */
 
 #include "boot.h"
-#include <linux/kernel.h>
 
 #define SMAP	0x534d4150	/* ASCII "SMAP" */
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,6 @@ @@
      */
     #include "boot.h"
-    #include <linux/kernel.h>
     #define SMAP	0x534d4150	/* ASCII "SMAP" */
@@ Expand Down @@