git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
of/flattree: Fix unhandled OF_DT_NOP tag when unflattening the device tree
[safe/jmp/linux-2.6]
/
drivers
/
of
/
fdt.c
diff --git
a/drivers/of/fdt.c
b/drivers/of/fdt.c
index
406757a
..
dee4fb5
100644
(file)
--- a/
drivers/of/fdt.c
+++ b/
drivers/of/fdt.c
@@
-376,8
+376,11
@@
unsigned long __init unflatten_dt_node(unsigned long mem,
if (!np->type)
np->type = "<NULL>";
}
if (!np->type)
np->type = "<NULL>";
}
- while (tag == OF_DT_BEGIN_NODE) {
- mem = unflatten_dt_node(mem, p, np, allnextpp, fpsize);
+ while (tag == OF_DT_BEGIN_NODE || tag == OF_DT_NOP) {
+ if (tag == OF_DT_NOP)
+ *p += 4;
+ else
+ mem = unflatten_dt_node(mem, p, np, allnextpp, fpsize);
tag = be32_to_cpup((__be32 *)(*p));
}
if (tag != OF_DT_END_NODE) {
tag = be32_to_cpup((__be32 *)(*p));
}
if (tag != OF_DT_END_NODE) {