mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
mtd-utils: refresh patches now merged upstream
Update Upstream-Status tags and apply 010-fix-rpmatch.patch unconditionally, since it's merged unconditionally upstream. (From OE-Core rev: 87dcaf2094baf9a7b7993c2ff1f60db73f4248f4) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
3df7ee4755
commit
31a293d0dc
@@ -1,16 +1,25 @@
|
||||
Upstream-Status: Pending
|
||||
From 7d026a85946a08b8167dcd792ea6660bf6a49e08 Mon Sep 17 00:00:00 2001
|
||||
From: Yuanjie Huang <Yuanjie.Huang@windriver.com>
|
||||
Date: Thu, 2 Mar 2017 10:43:56 +0100
|
||||
Subject: [PATCH] Fix alignment trap triggered by NEON instructions
|
||||
|
||||
NEON instruction VLD1.64 was used to copy 64 bits data after type
|
||||
casting, and they will trigger alignment trap.
|
||||
This patch uses memcpy to avoid alignment problem.
|
||||
|
||||
Signed-off-by: Yuanjie Huang <Yuanjie.Huang@windriver.com>
|
||||
Upstream-Status: Backport
|
||||
|
||||
diff --git a/mkfs.ubifs/key.h b/mkfs.ubifs/key.h
|
||||
index d3a02d4..e7e9218 100644
|
||||
Signed-off-by: Yuanjie Huang <Yuanjie.Huang@windriver.com>
|
||||
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
|
||||
---
|
||||
ubifs-utils/mkfs.ubifs/key.h | 16 ++++++++++------
|
||||
1 file changed, 10 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/ubifs-utils/mkfs.ubifs/key.h b/ubifs-utils/mkfs.ubifs/key.h
|
||||
index 39379fd..118858b 100644
|
||||
--- a/ubifs-utils/mkfs.ubifs/key.h
|
||||
+++ b/ubifs-utils/mkfs.ubifs/key.h
|
||||
@@ -141,10 +141,12 @@ static inline void data_key_init(union ubifs_key *key, ino_t inum,
|
||||
@@ -159,10 +159,12 @@ static inline void data_key_init(union ubifs_key *key, ino_t inum,
|
||||
*/
|
||||
static inline void key_write(const union ubifs_key *from, void *to)
|
||||
{
|
||||
@@ -26,7 +35,7 @@ index d3a02d4..e7e9218 100644
|
||||
memset(to + 8, 0, UBIFS_MAX_KEY_LEN - 8);
|
||||
}
|
||||
|
||||
@@ -156,10 +158,12 @@ static inline void key_write(const union ubifs_key *from, void *to)
|
||||
@@ -174,10 +176,12 @@ static inline void key_write(const union ubifs_key *from, void *to)
|
||||
*/
|
||||
static inline void key_write_idx(const union ubifs_key *from, void *to)
|
||||
{
|
||||
@@ -42,3 +51,5 @@ index d3a02d4..e7e9218 100644
|
||||
}
|
||||
|
||||
/**
|
||||
--
|
||||
2.6.1
|
||||
|
||||
Reference in New Issue
Block a user