projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: 8025/1: Get rid of meminfo
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
kernel
/
atags_parse.c
diff --git
a/arch/arm/kernel/atags_parse.c
b/arch/arm/kernel/atags_parse.c
index 8c14de8180c0af46fea1531261a7a276177a91a8..7807ef58a2abb88be8e452a47d2e4586168f63c2 100644
(file)
--- a/
arch/arm/kernel/atags_parse.c
+++ b/
arch/arm/kernel/atags_parse.c
@@
-22,6
+22,7
@@
#include <linux/fs.h>
#include <linux/root_dev.h>
#include <linux/screen_info.h>
#include <linux/fs.h>
#include <linux/root_dev.h>
#include <linux/screen_info.h>
+#include <linux/memblock.h>
#include <asm/setup.h>
#include <asm/system_info.h>
#include <asm/setup.h>
#include <asm/system_info.h>
@@
-222,10
+223,10
@@
setup_machine_tags(phys_addr_t __atags_pointer, unsigned int machine_nr)
}
if (mdesc->fixup)
}
if (mdesc->fixup)
- mdesc->fixup(tags, &from
, &meminfo
);
+ mdesc->fixup(tags, &from);
if (tags->hdr.tag == ATAG_CORE) {
if (tags->hdr.tag == ATAG_CORE) {
- if (mem
info.nr_banks != 0
)
+ if (mem
block_phys_mem_size()
)
squash_mem_tags(tags);
save_atags(tags);
parse_tags(tags);
squash_mem_tags(tags);
save_atags(tags);
parse_tags(tags);