diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-15 20:29:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-15 20:29:29 +0100 |
| commit | a5d53ad243dc3178fa9001d8ab1f19c63f8debd5 (patch) | |
| tree | 0139239f56b2dea497a003b4512a4ba849591306 /drivers/of/fdt.c | |
| parent | 15fdd2469e03d44975d548a73e689a725e76a5ee (diff) | |
| parent | 8751cf9a6c5f5bf02a2de8a4c025e09b38556df4 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
Conflicts:
Documentation/arm64/tagged-pointers.txt
arch/arm64/Kconfig
arch/arm64/boot/dts/Makefile
arch/arm64/include/asm/arch_timer.h
arch/arm64/include/asm/elf.h
arch/arm64/include/asm/spinlock.h
arch/arm64/kernel/smp.c
Diffstat (limited to 'drivers/of/fdt.c')
| -rw-r--r-- | drivers/of/fdt.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 118773751ea4..a1ebaecc8122 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -552,7 +552,8 @@ int __init of_flat_dt_match(unsigned long node, const char *const *compat) */ void __init early_init_dt_check_for_initrd(unsigned long node) { - unsigned long start, end, len; + u64 start, end; + unsigned long len; __be32 *prop; pr_debug("Looking for initrd properties... "); @@ -560,15 +561,16 @@ void __init early_init_dt_check_for_initrd(unsigned long node) prop = of_get_flat_dt_prop(node, "linux,initrd-start", &len); if (!prop) return; - start = of_read_ulong(prop, len/4); + start = of_read_number(prop, len/4); prop = of_get_flat_dt_prop(node, "linux,initrd-end", &len); if (!prop) return; - end = of_read_ulong(prop, len/4); + end = of_read_number(prop, len/4); early_init_dt_setup_initrd_arch(start, end); - pr_debug("initrd_start=0x%lx initrd_end=0x%lx\n", start, end); + pr_debug("initrd_start=0x%llx initrd_end=0x%llx\n", + (unsigned long long)start, (unsigned long long)end); } #else inline void early_init_dt_check_for_initrd(unsigned long node) |