Merge tag 'perf-urgent-for-mingo-4.14-20171027' of...

int symbol__alloc_hist(struct symbol *sym)

{

	struct annotation *notes = symbol__annotation(sym);

	const size_t size = symbol__size(sym);

	size_t size = symbol__size(sym);

	size_t sizeof_sym_hist;

	/*

	 * Add buffer of one element for zero length symbol.

	 * When sample is taken from first instruction of

	 * zero length symbol, perf still resolves it and

	 * shows symbol name in perf report and allows to

	 * annotate it.

	 */

	if (size == 0)

		size = 1;

	/* Check for overflow when calculating sizeof_sym_hist */

	if (size > (SIZE_MAX - sizeof(struct sym_hist)) / sizeof(struct sym_hist_entry))

		return -1;

	yycolumn += yyleng;				\

} while (0);

#define USER_REJECT		\

	yycolumn -= yyleng;	\

	REJECT

%}

%x mem

{num_hex}		{ return value(yyscanner, 16); }

{modifier_event}	{ return str(yyscanner, PE_MODIFIER_EVENT); }

{bpf_object}		{ if (!isbpf(yyscanner)) REJECT; return str(yyscanner, PE_BPF_OBJECT); }

{bpf_source}		{ if (!isbpf(yyscanner)) REJECT; return str(yyscanner, PE_BPF_SOURCE); }

{bpf_object}		{ if (!isbpf(yyscanner)) USER_REJECT; return str(yyscanner, PE_BPF_OBJECT); }

{bpf_source}		{ if (!isbpf(yyscanner)) USER_REJECT; return str(yyscanner, PE_BPF_SOURCE); }

{name}			{ return pmu_str_check(yyscanner); }

"/"			{ BEGIN(config); return '/'; }

-			{ return '-'; }