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

Commit 3ab2846a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "kernel: Fix build errors with LLVM"

parents d4921e03 4e297f45

drivers/clk/msm/clock-gcc-8909.c

+2 −2
Original line number Diff line number Diff line 
/*

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

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

 *

 * 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
@@ -1062,7 +1062,7 @@ static struct rcg_clk pclk0_clk_src = { 
	.c = {

		.dbg_name = "pclk0_clk_src",

		.ops = &clk_ops_pixel,

		VDD_DIG_FMAX_MAP1(LOWER, 83333333.33),

		VDD_DIG_FMAX_MAP1(LOWER, 83333333),

		CLK_INIT(pclk0_clk_src.c),

	},

};

drivers/mtd/devices/msm_qpic_nand.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007 Google, Inc.

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

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

 *

 * 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
@@ -3052,7 +3052,7 @@ static int msm_nand_scan(struct mtd_info *mtd) 
		for (i = 0; !flashman && nand_manuf_ids[i].id; ++i)

			if (nand_manuf_ids[i].id == manid)

				flashman = &nand_manuf_ids[i];

		for (i = 0; !flashdev && nand_flash_ids[i].id; ++i) {

		for (i = 0; !flashdev && (nand_flash_ids[i].id != NULL); ++i) {

			/*

			 * If id_len is specified for an entry in the nand ids

			 * array, then at least 4 bytes of the nand id is

drivers/soc/qcom/pil_bg_intf.h

+5 −5
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.

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

 *

 * 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
@@ -27,18 +27,18 @@ enum bg_tz_commands { 
};



/* tzapp bg request.*/

__packed struct tzapp_bg_req {

struct tzapp_bg_req {

	uint8_t tzapp_bg_cmd;

	phys_addr_t address_fw;

	size_t size_fw;

};

} __attribute__ ((__packed__));



/* tzapp bg response.*/

__packed struct tzapp_bg_rsp {

struct tzapp_bg_rsp {

	uint32_t tzapp_bg_cmd;

	uint32_t bg_info_len;

	int32_t status;

	uint32_t bg_info[100];

};

} __attribute__ ((__packed__));



#endif

security/apparmor/domain.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static struct file_perms change_profile_perms(struct aa_profile *profile, 
		return perms;

	} else if (!profile->file.dfa) {

		return nullperms;

	} else if ((ns == profile->ns)) {

	} else if (ns == profile->ns) {

		/* try matching against rules with out namespace prepended */

		aa_str_perms(profile->file.dfa, start, name, &cond, &perms);

		if (COMBINED_PERM_MASK(perms) & request)