shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge c0dde4a52b ("dm-ebs: don't set the flag DM_TARGET_PASSES_INTEGRITY") into android14-6.1-lts

Browse Source 
Steps on the way to 6.1.125

Resolves merge conflicts in:
	net/core/sock_map.c

Change-Id: Ie56905f271c73906e8176b2aaa69e368145b1bb9
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-01-17 15:40:16 +00:00
parent e280ed497f c0dde4a52b
commit c0e2451628
35 changed files with 206 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/sorttable.h
View File

@@ -110,7 +110,7 @@ static inline unsigned long orc_ip(const int *ip)
static int orc_sort_cmp(const void *_a, const void *_b)
{
struct orc_entry *orc_a;
struct orc_entry *orc_a, *orc_b;
const int *a = g_orc_ip_table + *(int *)_a;
const int *b = g_orc_ip_table + *(int *)_b;
unsigned long a_val = orc_ip(a);
@@ -128,6 +128,10 @@ static int orc_sort_cmp(const void *_a, const void *_b)
* whitelisted .o files which didn't get objtool generation.
*/
orc_a = g_orc_table + (a - g_orc_ip_table);
orc_b = g_orc_table + (b - g_orc_ip_table);
if (orc_a->sp_reg == ORC_REG_UNDEFINED && !orc_a->end &&
orc_b->sp_reg == ORC_REG_UNDEFINED && !orc_b->end)
return 0;
return orc_a->sp_reg == ORC_REG_UNDEFINED && !orc_a->end ? -1 : 1;
}