asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'sm8250/lineage-20' into lineage-20

Browse source 
* sm8250/lineage-20:
  Revert "perf: protect group_leader from races that cause ctx double-free"
  ipa_v3: Fix enum conversion warnings
  thermal: tsens: Fix exported function marked as static
  qca-wifi-host-cmn: Add void keyword to old-style zero prototype functions
  qcacld-3.0: Fix compile error of mdie
  msm: camera: Fix strict-prototypes error
  drivers: rmnet_perf: Fix strict-prototypes error
  input: touchscreen: synaptics_dsx: Fix missing include

Change-Id: I00cd1aa82f743c1e4031ae2f1c8407a92a1844f3
This commit is contained in:
Michael Bestas 2023-10-25 20:44:53 +03:00
commit d30be0986a
No known key found for this signature in database
GPG key ID: CC95044519BE6669
12 changed files with 11 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c
View file

@ -36,6 +36,7 @@
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/i2c.h>
#include <linux/input.h>
#include <linux/gpio.h>
#include <linux/platform_device.h>

4
drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
View file

@ -489,8 +489,8 @@ static void ipa3_copy_qmi_flt_rule_ex(
*/
flt_spec_ptr = (struct ipa_filter_spec_ex_type_v01 *) flt_spec_ptr_void;
q6_ul_flt_rule_ptr->ip = flt_spec_ptr->ip_type;
q6_ul_flt_rule_ptr->action = flt_spec_ptr->filter_action;
q6_ul_flt_rule_ptr->ip = (enum ipa_ip_type)flt_spec_ptr->ip_type;
q6_ul_flt_rule_ptr->action = (enum ipa_flt_action)flt_spec_ptr->filter_action;
if (flt_spec_ptr->is_routing_table_index_valid == true)
q6_ul_flt_rule_ptr->rt_tbl_idx =
flt_spec_ptr->route_table_index;

2
drivers/staging/qca-wifi-host-cmn/hif/src/ce/ce_service_legacy.c
View file

@ -1317,7 +1317,7 @@ struct ce_ops ce_service_legacy = {
#endif
};
struct ce_ops *ce_services_legacy()
struct ce_ops *ce_services_legacy(void)
{
return &ce_service_legacy;
}

2
drivers/staging/qca-wifi-host-cmn/hif/src/ce/ce_service_srng.c
View file

@ -1014,7 +1014,7 @@ static struct ce_ops ce_service_srng = {
#endif
};
struct ce_ops *ce_services_srng()
struct ce_ops *ce_services_srng(void)
{
return &ce_service_srng;
}

2
drivers/staging/qca-wifi-host-cmn/target_if/core/src/target_if_main.c
View file

@ -88,7 +88,7 @@
static struct target_if_ctx *g_target_if_ctx;
struct target_if_ctx *target_if_get_ctx()
struct target_if_ctx *target_if_get_ctx(void)
{
return g_target_if_ctx;
}

2
drivers/staging/qca-wifi-host-cmn/umac/scan/dispatcher/src/wlan_extscan_api.c
View file

@ -100,7 +100,7 @@ wlan_extscan_global_init(struct wlan_objmgr_psoc *psoc,
}
QDF_STATUS
wlan_extscan_global_deinit()
wlan_extscan_global_deinit(void)
{
return QDF_STATUS_SUCCESS;
}

2
drivers/staging/qcacld-3.0/core/mac/src/sys/legacy/src/utils/src/parser_api.c
View file

@ -5911,7 +5911,7 @@ QDF_STATUS populate_dot11f_rrm_ie(struct mac_context *mac,
void populate_mdie(struct mac_context *mac,
tDot11fIEMobilityDomain *pDot11f,
uint8_t mdie[SIR_MDIE_SIZE])
uint8_t mdie[])
{
pDot11f->present = 1;
pDot11f->MDID = (uint16_t) ((mdie[1] << 8) | (mdie[0]));

2
drivers/thermal/tsens-mtc.c
View file

@ -22,7 +22,7 @@ struct tsens_device *tsens_controller_is_present(void)
}
EXPORT_SYMBOL(tsens_controller_is_present);
static int tsens_mtc_reset_history_counter(unsigned int zone)
int tsens_mtc_reset_history_counter(unsigned int zone)
{
unsigned int reg_cntl, is_valid;
void __iomem *sensor_addr;

6
include/linux/perf_event.h
View file

@ -598,12 +598,6 @@ struct perf_event {
int group_caps;
struct perf_event *group_leader;
/*
* Protect the pmu, attributes and context of a group leader.
* Note: does not protect the pointer to the group_leader.
*/
struct mutex group_leader_mutex;
struct pmu *pmu;
void *pmu_private;

15
kernel/events/core.c
View file

@ -10370,7 +10370,6 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
if (!group_leader)
group_leader = event;
mutex_init(&event->group_leader_mutex);
mutex_init(&event->child_mutex);
INIT_LIST_HEAD(&event->child_list);
@ -10946,16 +10945,6 @@ SYSCALL_DEFINE5(perf_event_open,
group_leader = NULL;
}
/*
* Take the group_leader's group_leader_mutex before observing
* anything in the group leader that leads to changes in ctx,
* many of which may be changing on another thread.
* In particular, we want to take this lock before deciding
* whether we need to move_group.
*/
if (group_leader)
mutex_lock(&group_leader->group_leader_mutex);
if (pid != -1 && !(flags & PERF_FLAG_PID_CGROUP)) {
task = find_lively_task_by_vpid(pid);
if (IS_ERR(task)) {
@ -11271,8 +11260,6 @@ not_move_group:
if (move_group)
perf_event_ctx_unlock(group_leader, gctx);
mutex_unlock(&ctx->mutex);
if (group_leader)
mutex_unlock(&group_leader->group_leader_mutex);
if (task) {
mutex_unlock(&task->signal->cred_guard_mutex);
@ -11326,8 +11313,6 @@ err_task:
if (task)
put_task_struct(task);
err_group_fd:
if (group_leader)
mutex_unlock(&group_leader->group_leader_mutex);
fdput(group);
err_fd:
put_unused_fd(event_fd);

2
techpack/camera-bengal/drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c
View file

@ -3590,7 +3590,7 @@ static int cam_ope_mgr_hw_open_u(void *hw_priv, void *fw_download_args)
return rc;
}
static cam_ope_mgr_hw_close_u(void *hw_priv, void *hw_close_args)
static int cam_ope_mgr_hw_close_u(void *hw_priv, void *hw_close_args)
{
struct cam_ope_hw_mgr *hw_mgr;
int rc = 0;

2
techpack/data/drivers/rmnet/perf/rmnet_perf_opt.c
View file

@ -712,7 +712,7 @@ void rmnet_perf_opt_insert_pkt_in_flow(
flow_node->next_seq += payload_len;
}
void
rmnet_perf_free_hash_table()
rmnet_perf_free_hash_table(void)
{
int i;
struct rmnet_perf_opt_flow_node *flow_node;