summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-13 01:21:19 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-13 01:21:19 +0400
commit8d86e5f91440aa56a5df516bf58fe3883552ad56 (patch)
tree94c8aea597b9e1ade376743a3f8f830e5195fa57 /include
parentd93a881dd7d71ad0e6504af232be2795044ab686 (diff)
parent770e1ac5f29003fca18af4e67eb5a05ddb5b1491 (diff)
downloadlinux-8d86e5f91440aa56a5df516bf58fe3883552ad56.tar.xz
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/mm: Fix memory_block_size_bytes() for non-pseries mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header
Diffstat (limited to 'include')
-rw-r--r--include/linux/memory.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/memory.h b/include/linux/memory.h
index e1e3b2b84f85..935699b30b7c 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -20,6 +20,8 @@
#include <linux/compiler.h>
#include <linux/mutex.h>
+#define MIN_MEMORY_BLOCK_SIZE (1 << SECTION_SIZE_BITS)
+
struct memory_block {
unsigned long start_section_nr;
unsigned long end_section_nr;