github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-30 11:11:26 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge "android: abi_gki_aarch64_qcom: Add device_match_of_node"

Browse Source
This commit is contained in:
qctecmdr 2022-09-12 01:03:18 -07:00 committed by Gerrit - the friendly Code Review server
commit 21315ac40e
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
android/abi_gki_aarch64_qcom
View File

@ -160,8 +160,8 @@
cond_synchronize_rcu_expedited
config_ep_by_speed
configfs_register_group
configfs_unregister_group
configfs_register_subsystem
configfs_unregister_group
configfs_unregister_subsystem
config_group_init
config_group_init_type_name
@ -290,6 +290,7 @@
device_link_add
device_match_fwnode
device_match_name
device_match_of_node
device_property_present
device_property_read_string
device_property_read_u16_array
@ -1381,8 +1382,8 @@
__rcu_read_unlock
rcu_read_unlock_trace_special
rcu_tasks_trace_qs_blkd
rcu_trc_cmpxchg_need_qs
rcutorture_get_gp_data
rcu_trc_cmpxchg_need_qs
rcu_unexpedite_gp
rcuwait_wake_up
rdev_get_drvdata

6
include/linux/gunyah/gh_mem_notifier.h
View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
*
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#ifndef __GH_MEM_NOTIFIER_H
@ -33,14 +33,14 @@ void *gh_mem_notifier_register(enum gh_mem_notifier_tag tag,
void *data);
void gh_mem_notifier_unregister(void *cookie);
#else
static void *gh_mem_notifier_register(enum gh_mem_notifier_tag tag,
static void __maybe_unused *gh_mem_notifier_register(enum gh_mem_notifier_tag tag,
gh_mem_notifier_handler notif_handler,
void *data)
{
return ERR_PTR(-EOPNOTSUPP);
}
static void gh_mem_notifier_unregister(void *cookie)
static void __maybe_unused gh_mem_notifier_unregister(void *cookie)
{
}
#endif

2
include/linux/soc/qcom/llcc-qcom.h
View File

@ -54,7 +54,7 @@
#define LLCC_CAMEXP4 52
#define LLCC_DISP_WB 53
#define LLCC_DISP_1 54
#define LLCC_VIDVSP 55
#define LLCC_VIDVSP 64
/**
* llcc_slice_desc - Cache slice descriptor