Merge "drivers: rmnet: Fix warnings in trace/events/rmnet.h" (111ea99f) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/edac/kryo_arm64_edac.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	// SPDX-License-Identifier: GPL-2.0-only		// SPDX-License-Identifier: GPL-2.0-only
	/*		/*
	* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.		* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
	*/		*/

	#include <linux/kernel.h>		#include <linux/kernel.h>
	@@ -270,7 +270,7 @@ static void kryo_parse_l1_l2_cache_error(u64 errxstatus, u64 errxmisc,
	break;		break;
	default:		default:
	edac_printk(KERN_CRIT, EDAC_CPU,		edac_printk(KERN_CRIT, EDAC_CPU,
	"silver cpu:%d unknown error location:%u\n",		"silver cpu:%d unknown error location:%llu\n",
	cpu, KRYO_ERRXMISC_LVL(errxmisc));		cpu, KRYO_ERRXMISC_LVL(errxmisc));
	}		}
	break;		break;
	@@ -286,7 +286,7 @@ static void kryo_parse_l1_l2_cache_error(u64 errxstatus, u64 errxmisc,
	break;		break;
	default:		default:
	edac_printk(KERN_CRIT, EDAC_CPU,		edac_printk(KERN_CRIT, EDAC_CPU,
	"gold cpu:%d unknown error location:%u\n",		"gold cpu:%d unknown error location:%llu\n",
	cpu, KRYO_ERRXMISC_LVL_GOLD(errxmisc));		cpu, KRYO_ERRXMISC_LVL_GOLD(errxmisc));
	}		}
	break;		break;

drivers/iommu/iommu-debug.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	// SPDX-License-Identifier: GPL-2.0-only		// SPDX-License-Identifier: GPL-2.0-only
	/*		/*
	* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.		* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License version 2 and		* it under the terms of the GNU General Public License version 2 and
	@@ -404,7 +404,7 @@ static const char * const _size_to_string(unsigned long size)
	case SZ_1M * 32:		case SZ_1M * 32:
	return "32M";		return "32M";
	}		}
	return "unknown size, please add to %s function", __func__;		return "unknown size, please add to _size_to_string function";
	}		}

	static int nr_iters_set(void *data, u64 val)		static int nr_iters_set(void *data, u64 val)

include/trace/events/rmnet.h

+13 −13

Original line number	Original line	Diff line number	Diff line
	/* SPDX-License-Identifier: GPL-2.0-only */		/* SPDX-License-Identifier: GPL-2.0-only */
	/* Copyright (c) 2018, The Linux Foundation. All rights reserved.		/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
	*/		*/

	#undef TRACE_SYSTEM		#undef TRACE_SYSTEM
	@@ -62,7 +62,7 @@ TRACE_EVENT(rmnet_low,
	__entry->ptr2 = ptr2;		__entry->ptr2 = ptr2;
	),		),

	TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%lu ul2:%lu p1:0x%pK p2:0x%pK",		TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%llu ul2:%llu p1:0x%pK p2:0x%pK",
	__entry->func, __entry->evt,		__entry->func, __entry->evt,
	__entry->uint1, __entry->uint2,		__entry->uint1, __entry->uint2,
	__entry->ulong1, __entry->ulong2,		__entry->ulong1, __entry->ulong2,
	@@ -98,7 +98,7 @@ TRACE_EVENT(rmnet_high,
	__entry->ptr2 = ptr2;		__entry->ptr2 = ptr2;
	),		),

	TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%lu ul2:%lu p1:0x%pK p2:0x%pK",		TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%llu ul2:%llu p1:0x%pK p2:0x%pK",
	__entry->func, __entry->evt,		__entry->func, __entry->evt,
	__entry->uint1, __entry->uint2,		__entry->uint1, __entry->uint2,
	__entry->ulong1, __entry->ulong2,		__entry->ulong1, __entry->ulong2,
	@@ -134,7 +134,7 @@ TRACE_EVENT(rmnet_err,
	__entry->ptr2 = ptr2;		__entry->ptr2 = ptr2;
	),		),

	TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%lu ul2:%lu p1:0x%pK p2:0x%pK",		TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%llu ul2:%llu p1:0x%pK p2:0x%pK",
	__entry->func, __entry->evt,		__entry->func, __entry->evt,
	__entry->uint1, __entry->uint2,		__entry->uint1, __entry->uint2,
	__entry->ulong1, __entry->ulong2,		__entry->ulong1, __entry->ulong2,
	@@ -173,7 +173,7 @@ TRACE_EVENT(rmnet_perf_low,
	__entry->ptr2 = ptr2;		__entry->ptr2 = ptr2;
	),		),

	TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%lu ul2:%lu p1:0x%pK p2:0x%pK",		TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%llu ul2:%llu p1:0x%pK p2:0x%pK",
	__entry->func, __entry->evt,		__entry->func, __entry->evt,
	__entry->uint1, __entry->uint2,		__entry->uint1, __entry->uint2,
	__entry->ulong1, __entry->ulong2,		__entry->ulong1, __entry->ulong2,
	@@ -209,7 +209,7 @@ TRACE_EVENT(rmnet_perf_high,
	__entry->ptr2 = ptr2;		__entry->ptr2 = ptr2;
	),		),

	TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%lu ul2:%lu p1:0x%pK p2:0x%pK",		TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%llu ul2:%llu p1:0x%pK p2:0x%pK",
	__entry->func, __entry->evt,		__entry->func, __entry->evt,
	__entry->uint1, __entry->uint2,		__entry->uint1, __entry->uint2,
	__entry->ulong1, __entry->ulong2,		__entry->ulong1, __entry->ulong2,
	@@ -245,7 +245,7 @@ TRACE_EVENT(rmnet_perf_err,
	__entry->ptr2 = ptr2;		__entry->ptr2 = ptr2;
	),		),

	TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%lu ul2:%lu p1:0x%pK p2:0x%pK",		TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%llu ul2:%llu p1:0x%pK p2:0x%pK",
	__entry->func, __entry->evt,		__entry->func, __entry->evt,
	__entry->uint1, __entry->uint2,		__entry->uint1, __entry->uint2,
	__entry->ulong1, __entry->ulong2,		__entry->ulong1, __entry->ulong2,
	@@ -284,7 +284,7 @@ TRACE_EVENT(rmnet_shs_low,
	__entry->ptr2 = ptr2;		__entry->ptr2 = ptr2;
	),		),

	TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%lu ul2:%lu p1:0x%pK p2:0x%pK",		TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%llu ul2:%llu p1:0x%pK p2:0x%pK",
	__entry->func, __entry->evt,		__entry->func, __entry->evt,
	__entry->uint1, __entry->uint2,		__entry->uint1, __entry->uint2,
	__entry->ulong1, __entry->ulong2,		__entry->ulong1, __entry->ulong2,
	@@ -320,7 +320,7 @@ TRACE_EVENT(rmnet_shs_high,
	__entry->ptr2 = ptr2;		__entry->ptr2 = ptr2;
	),		),

	TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%lu ul2:%lu p1:0x%pK p2:0x%pK",		TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%llu ul2:%llu p1:0x%pK p2:0x%pK",
	__entry->func, __entry->evt,		__entry->func, __entry->evt,
	__entry->uint1, __entry->uint2,		__entry->uint1, __entry->uint2,
	__entry->ulong1, __entry->ulong2,		__entry->ulong1, __entry->ulong2,
	@@ -356,7 +356,7 @@ TRACE_EVENT(rmnet_shs_err,
	__entry->ptr2 = ptr2;		__entry->ptr2 = ptr2;
	),		),

	TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%lu ul2:%lu p1:0x%pK p2:0x%pK",		TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%llu ul2:%llu p1:0x%pK p2:0x%pK",
	__entry->func, __entry->evt,		__entry->func, __entry->evt,
	__entry->uint1, __entry->uint2,		__entry->uint1, __entry->uint2,
	__entry->ulong1, __entry->ulong2,		__entry->ulong1, __entry->ulong2,
	@@ -392,7 +392,7 @@ TRACE_EVENT(rmnet_shs_wq_low,
	__entry->ptr2 = ptr2;		__entry->ptr2 = ptr2;
	),		),

	TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%lu ul2:%lu p1:0x%pK p2:0x%pK",		TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%llu ul2:%llu p1:0x%pK p2:0x%pK",
	__entry->func, __entry->evt,		__entry->func, __entry->evt,
	__entry->uint1, __entry->uint2,		__entry->uint1, __entry->uint2,
	__entry->ulong1, __entry->ulong2,		__entry->ulong1, __entry->ulong2,
	@@ -428,7 +428,7 @@ TRACE_EVENT(rmnet_shs_wq_high,
	__entry->ptr2 = ptr2;		__entry->ptr2 = ptr2;
	),		),

	TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%lu ul2:%lu p1:0x%pK p2:0x%pK",		TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%llu ul2:%llu p1:0x%pK p2:0x%pK",
	__entry->func, __entry->evt,		__entry->func, __entry->evt,
	__entry->uint1, __entry->uint2,		__entry->uint1, __entry->uint2,
	__entry->ulong1, __entry->ulong2,		__entry->ulong1, __entry->ulong2,
	@@ -464,7 +464,7 @@ TRACE_EVENT(rmnet_shs_wq_err,
	__entry->ptr2 = ptr2;		__entry->ptr2 = ptr2;
	),		),

	TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%lu ul2:%lu p1:0x%pK p2:0x%pK",		TP_printk("fun:%u ev:%u u1:%u u2:%u ul1:%llu ul2:%llu p1:0x%pK p2:0x%pK",
	__entry->func, __entry->evt,		__entry->func, __entry->evt,
	__entry->uint1, __entry->uint2,		__entry->uint1, __entry->uint2,
	__entry->ulong1, __entry->ulong2,		__entry->ulong1, __entry->ulong2,