diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:42 -0400 |
| commit | ae82bfd61ca7e57cc2d914add9ab0873e260f2f5 (patch) | |
| tree | a7f862ad8b0ae4f2e8953e6aa613eb702b484ecf /mm/memory.c | |
| parent | cd74c86bdf705f824d494a2bbda393d1d562b40a (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'linus' into perfcounters/rename
Merge reason: pull in all the latest code before doing the rename.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/memory.c b/mm/memory.c index aede2ce3aba4..e8f63d9961ea 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -56,6 +56,7 @@ | |||
| 56 | #include <linux/swapops.h> | 56 | #include <linux/swapops.h> |
| 57 | #include <linux/elf.h> | 57 | #include <linux/elf.h> |
| 58 | 58 | ||
| 59 | #include <asm/io.h> | ||
| 59 | #include <asm/pgalloc.h> | 60 | #include <asm/pgalloc.h> |
| 60 | #include <asm/uaccess.h> | 61 | #include <asm/uaccess.h> |
| 61 | #include <asm/tlb.h> | 62 | #include <asm/tlb.h> |