diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-05-21 01:01:17 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-05-21 01:01:17 +0200 |
| commit | 128f7491311b744f54bcd163be5e38839943bcd6 (patch) | |
| tree | b540d654a59343bd767b3c6d3c75e2925e48eec5 /Documentation | |
| parent | 4a31b8a3519d5dde0eacbb088b0d45c83732535b (diff) | |
| parent | 5efe91c00c98c72cbe8475caa6e72c520199e32b (diff) | |
Merge tag 'v4.4.220' into toradex_vf_4.4-next
This is the 4.4.220 stable release
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/accounting/getdelays.c | 2 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/fman.txt | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c index f40578026a04..8b14a6b08862 100644 --- a/Documentation/accounting/getdelays.c +++ b/Documentation/accounting/getdelays.c @@ -135,7 +135,7 @@ static int send_cmd(int sd, __u16 nlmsg_type, __u32 nlmsg_pid, msg.g.version = 0x1; na = (struct nlattr *) GENLMSG_DATA(&msg); na->nla_type = nla_type; - na->nla_len = nla_len + 1 + NLA_HDRLEN; + na->nla_len = nla_len + NLA_HDRLEN; memcpy(NLA_DATA(na), nla_data, nla_len); msg.n.nlmsg_len += NLMSG_ALIGN(na->nla_len); diff --git a/Documentation/devicetree/bindings/powerpc/fsl/fman.txt b/Documentation/devicetree/bindings/powerpc/fsl/fman.txt index 1fc5328c0651..23708f3f4e58 100644 --- a/Documentation/devicetree/bindings/powerpc/fsl/fman.txt +++ b/Documentation/devicetree/bindings/powerpc/fsl/fman.txt @@ -110,6 +110,13 @@ PROPERTIES Usage: required Definition: See soc/fsl/qman.txt and soc/fsl/bman.txt +- fsl,erratum-a050385 + Usage: optional + Value type: boolean + Definition: A boolean property. Indicates the presence of the + erratum A050385 which indicates that DMA transactions that are + split can result in a FMan lock. + ============================================================================= FMan MURAM Node |