projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[deliverable/linux.git]
/
arch
/
x86
/
mm
/
numa.c
diff --git
a/arch/x86/mm/numa.c
b/arch/x86/mm/numa.c
index 9c086c57105c18cac6bbb4030c6c448eadf03af8..fb682108f4dc0511ed0ecc2778eb792e0e2a1b45 100644
(file)
--- a/
arch/x86/mm/numa.c
+++ b/
arch/x86/mm/numa.c
@@
-1,4
+1,5
@@
/* Common code for 32 and 64-bit NUMA */
/* Common code for 32 and 64-bit NUMA */
+#include <linux/acpi.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/string.h>
@@
-7,7
+8,6
@@
#include <linux/memblock.h>
#include <linux/mmzone.h>
#include <linux/ctype.h>
#include <linux/memblock.h>
#include <linux/mmzone.h>
#include <linux/ctype.h>
-#include <linux/module.h>
#include <linux/nodemask.h>
#include <linux/sched.h>
#include <linux/topology.h>
#include <linux/nodemask.h>
#include <linux/sched.h>
#include <linux/topology.h>
@@
-15,7
+15,6
@@
#include <asm/e820.h>
#include <asm/proto.h>
#include <asm/dma.h>
#include <asm/e820.h>
#include <asm/proto.h>
#include <asm/dma.h>
-#include <asm/acpi.h>
#include <asm/amd_nb.h>
#include "numa_internal.h"
#include <asm/amd_nb.h>
#include "numa_internal.h"
This page took
0.027431 seconds
and
5
git commands to generate.