git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-shark
/
include
/
mach
/
memory.h
diff --git
a/arch/arm/mach-shark/include/mach/memory.h
b/arch/arm/mach-shark/include/mach/memory.h
index
c5ab038
..
3053e5b
100644
(file)
--- a/
arch/arm/mach-shark/include/mach/memory.h
+++ b/
arch/arm/mach-shark/include/mach/memory.h
@@
-23,6
+23,7
@@
static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsig
{
if (node != 0) return;
/* Only the first 4 MB (=1024 Pages) are usable for DMA */
{
if (node != 0) return;
/* Only the first 4 MB (=1024 Pages) are usable for DMA */
+ /* See dev / -> .properties in OpenFirmware. */
zone_size[1] = zone_size[0] - 1024;
zone_size[0] = 1024;
zhole_size[1] = zhole_size[0];
zone_size[1] = zone_size[0] - 1024;
zone_size[0] = 1024;
zhole_size[1] = zhole_size[0];