diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2011-08-05 12:25:56 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-08-05 12:25:56 -0700 |
| commit | 13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2 (patch) | |
| tree | 6a81d50b611170ca6dd1ed9cce2b86dd19f190d8 /arch/x86/mm | |
| parent | 17edf2d79f1ea6dfdb4c444801d928953b9f98d6 (diff) | |
| parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
| download | op-kernel-dev-13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2.zip op-kernel-dev-13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2.tar.gz | |
Merge commit 'v3.0' into x86/cpu
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/init_64.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index d865c4ae..bbaaa00 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -28,6 +28,7 @@ #include <linux/poison.h> #include <linux/dma-mapping.h> #include <linux/module.h> +#include <linux/memory.h> #include <linux/memory_hotplug.h> #include <linux/nmi.h> #include <linux/gfp.h> @@ -895,8 +896,6 @@ const char *arch_vma_name(struct vm_area_struct *vma) } #ifdef CONFIG_X86_UV -#define MIN_MEMORY_BLOCK_SIZE (1 << SECTION_SIZE_BITS) - unsigned long memory_block_size_bytes(void) { if (is_uv_system()) { |
