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

Merge d8d6db8e98 ("of: Correct child specifier used as input of the 2nd nexus node") into android14-6.1-lts

Browse Source 
Steps on the way to 6.1.129

Change-Id: I64a3f94100b109e2dfb53c83003ef3c5a7cd97fd
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-03-11 11:04:13 +00:00
parent aa28806b5b d8d6db8e98
commit 028c8a63f1
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
block/blk-cgroup.c
View File

@@ -924,6 +924,7 @@ static void blkcg_fill_root_iostats(void)
blkg_iostat_set(&blkg->iostat.cur, &tmp); blkg_iostat_set(&blkg->iostat.cur, &tmp);
u64_stats_update_end_irqrestore(&blkg->iostat.sync, flags); u64_stats_update_end_irqrestore(&blkg->iostat.sync, flags);
} }
class_dev_iter_exit(&iter);
} }
static void blkcg_print_one_stat(struct blkcg_gq *blkg, struct seq_file *s) static void blkcg_print_one_stat(struct blkcg_gq *blkg, struct seq_file *s)

2
drivers/firmware/efi/libstub/Makefile
View File

@@ -7,7 +7,7 @@
# #
cflags-$(CONFIG_X86_32) := -march=i386 cflags-$(CONFIG_X86_32) := -march=i386
cflags-$(CONFIG_X86_64) := -mcmodel=small cflags-$(CONFIG_X86_64) := -mcmodel=small
cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ \ cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ -std=gnu11 \
-fPIC -fno-strict-aliasing -mno-red-zone \ -fPIC -fno-strict-aliasing -mno-red-zone \
-mno-mmx -mno-sse -fshort-wchar \ -mno-mmx -mno-sse -fshort-wchar \
-Wno-pointer-sign \ -Wno-pointer-sign \

2
drivers/of/base.c
View File

@@ -1635,7 +1635,6 @@ int of_parse_phandle_with_args_map(const struct device_node *np,
* specifier into the out_args structure, keeping the * specifier into the out_args structure, keeping the
* bits specified in <list>-map-pass-thru. * bits specified in <list>-map-pass-thru.
*/ */
match_array = map - new_size;
for (i = 0; i < new_size; i++) { for (i = 0; i < new_size; i++) {
__be32 val = *(map - new_size + i); __be32 val = *(map - new_size + i);
@@ -1644,6 +1643,7 @@ int of_parse_phandle_with_args_map(const struct device_node *np,
val |= cpu_to_be32(out_args->args[i]) & pass[i]; val |= cpu_to_be32(out_args->args[i]) & pass[i];
} }
initial_match_array[i] = val;
out_args->args[i] = be32_to_cpu(val); out_args->args[i] = be32_to_cpu(val);
} }
out_args->args_count = list_size = new_size; out_args->args_count = list_size = new_size;

4
include/ufs/ufs.h
View File

@@ -376,8 +376,8 @@ enum {
/* Possible values for dExtendedUFSFeaturesSupport */ /* Possible values for dExtendedUFSFeaturesSupport */
enum { enum {
UFS_DEV_LOW_TEMP_NOTIF = BIT(4), UFS_DEV_HIGH_TEMP_NOTIF = BIT(4),
UFS_DEV_HIGH_TEMP_NOTIF = BIT(5), UFS_DEV_LOW_TEMP_NOTIF = BIT(5),
UFS_DEV_EXT_TEMP_NOTIF = BIT(6), UFS_DEV_EXT_TEMP_NOTIF = BIT(6),
UFS_DEV_HPB_SUPPORT = BIT(7), UFS_DEV_HPB_SUPPORT = BIT(7),
UFS_DEV_WRITE_BOOSTER_SUP = BIT(8), UFS_DEV_WRITE_BOOSTER_SUP = BIT(8),