Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 35577
b: refs/heads/master
c: e786e86
h: refs/heads/master
i:
  35575: 7aa1145
v: v3
  • Loading branch information
Franck Bui-Huu authored and Linus Torvalds committed Sep 26, 2006
1 parent 07d4859 commit 92ea217
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bb0923a66820718f636736b22ce47372f79e3400
refs/heads/master: e786e86a542ccc1133f333402526ad00b9c088ae
5 changes: 1 addition & 4 deletions trunk/include/linux/bootmem.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 3 additions & 7 deletions trunk/mm/bootmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/*
Expand Down

0 comments on commit 92ea217

Please sign in to comment.