Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84b56d3a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Makefile: Remove -fno-builtin cflag"

parents 653e9abc dcc87ac4

Makefile

+0 −1
Original line number Diff line number Diff line
@@ -738,7 +738,6 @@ KBUILD_CFLAGS += $(call cc-disable-warning, gnu) 
KBUILD_CFLAGS += $(call cc-disable-warning, duplicate-decl-specifier)

KBUILD_CFLAGS += -Wno-asm-operand-widths

KBUILD_CFLAGS += -Wno-initializer-overrides

KBUILD_CFLAGS += -fno-builtin

KBUILD_CFLAGS += $(call cc-option, -Wno-undefined-optimized)

KBUILD_CFLAGS += $(call cc-option, -Wno-tautological-constant-out-of-range-compare)

KBUILD_CFLAGS += $(call cc-option, -mllvm -disable-struct-const-merge)

drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (C) 2012-2016 Synaptics Incorporated. All rights reserved.

 *

 * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.

 * Copyright (C) 2012 Alexandra Chin <alexandra.chin@tw.synaptics.com>

 * Copyright (C) 2012 Scott Lin <scott.lin@tw.synaptics.com>

 *
@@ -3637,7 +3637,7 @@ static int synaptics_rmi4_gpio_setup(int gpio, bool config, int dir, int state) 
	unsigned char buf[16];



	if (config) {

		snprintf(buf, PAGE_SIZE, "dsx_gpio_%u\n", gpio);

		snprintf(buf, sizeof(buf), "dsx_gpio_%u\n", gpio);



		retval = gpio_request(gpio, buf);

		if (retval) {

drivers/mmc/core/sdio_cis.c

+2 −1
Original line number Diff line number Diff line
@@ -54,8 +54,9 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func, 
	string = (char*)(buffer + nr_strings);



	for (i = 0; i < nr_strings; i++) {

		size_t buf_len = strlen(buf);

		buffer[i] = string;

		strlcpy(string, buf, strlen(buf) + 1);

		strlcpy(string, buf, buf_len + 1);

		string += strlen(string) + 1;

		buf += strlen(buf) + 1;

	}

drivers/soc/qcom/msm_minidump.c

+3 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2018,2020 The Linux Foundation. All rights reserved.

 */



#define pr_fmt(fmt) "Minidump: " fmt
@@ -355,6 +355,7 @@ static int msm_minidump_add_header(void) 
	struct elf_phdr *phdr;

	unsigned int strtbl_off, elfh_size, phdr_off;

	char *banner;

	size_t linux_banner_len = strlen(linux_banner);



	/* Header buffer contains:

	 * elf header, MAX_NUM_ENTRIES+4 of section and program elf headers,
@@ -425,7 +426,7 @@ static int msm_minidump_add_header(void) 


	/* 4th section is linux banner */

	banner = (char *)ehdr + strtbl_off + MAX_STRTBL_SIZE;

	strlcpy(banner, linux_banner, strlen(linux_banner) + 1);

	strlcpy(banner, linux_banner, linux_banner_len + 1);



	shdr->sh_type = SHT_PROGBITS;

	shdr->sh_offset = (elf_addr_t)(strtbl_off + MAX_STRTBL_SIZE);

drivers/soc/qcom/rpm_master_stat.c

+5 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only



/*

 * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/debugfs.h>
@@ -402,15 +402,17 @@ static struct msm_rpm_master_stats_platform_data 
	 */

	for (i = 0; i < pdata->num_masters; i++) {

		const char *master_name;

		size_t master_name_len;



		of_property_read_string_index(node, "qcom,masters",

							i, &master_name);

		master_name_len = strlen(master_name);

		pdata->masters[i] = devm_kzalloc(dev, sizeof(char) *

				strlen(master_name) + 1, GFP_KERNEL);

				master_name_len + 1, GFP_KERNEL);

		if (!pdata->masters[i])

			goto err;

		strlcpy(pdata->masters[i], master_name,

					strlen(master_name) + 1);

					master_name_len + 1);

	}

	return pdata;

err: