From 92ea217ef8baa400415e1c7ac0e2b930024a6534 Mon Sep 17 00:00:00 2001
From: Franck Bui-Huu <vagabon.xyz@gmail.com>
Date: Mon, 25 Sep 2006 23:31:06 -0700
Subject: [PATCH] --- yaml --- r: 35577 b: refs/heads/master c:
 e786e86a542ccc1133f333402526ad00b9c088ae h: refs/heads/master i:   35575:
 7aa11451381d72e61a705e3352aa76ea4f70d219 v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/bootmem.h |  5 +----
 trunk/mm/bootmem.c            | 10 +++-------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index d3a148001af8..4c69d89ec469 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb0923a66820718f636736b22ce47372f79e3400
+refs/heads/master: e786e86a542ccc1133f333402526ad00b9c088ae
diff --git a/trunk/include/linux/bootmem.h b/trunk/include/linux/bootmem.h
index 1e8dddfb3083..b2067e4a4486 100644
--- a/trunk/include/linux/bootmem.h
+++ b/trunk/include/linux/bootmem.h
@@ -4,11 +4,8 @@
 #ifndef _LINUX_BOOTMEM_H
 #define _LINUX_BOOTMEM_H
 
-#include <asm/pgtable.h>
-#include <asm/dma.h>
-#include <linux/cache.h>
-#include <linux/init.h>
 #include <linux/mmzone.h>
+#include <asm/dma.h>
 
 /*
  *  simple boot-time physical memory area allocator.
diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c
index 9083f5029673..e136c086fd98 100644
--- a/trunk/mm/bootmem.c
+++ b/trunk/mm/bootmem.c
@@ -8,17 +8,13 @@
  *  free memory collector. It's used to deal with reserved
  *  system memory and memory holes as well.
  */
-
-#include <linux/mm.h>
-#include <linux/kernel_stat.h>
-#include <linux/swap.h>
-#include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
-#include <linux/mmzone.h>
 #include <linux/module.h>
-#include <asm/dma.h>
+
+#include <asm/bug.h>
 #include <asm/io.h>
+
 #include "internal.h"
 
 /*