Unverified Commit 8377dd14 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3862 linux-4.19.y inclusion(4.19.299..4.19.303) part1 

Merge Pull Request from: @LiuYongQiang0816 
 
linux-4.19.y inclusion(4.19.299..4.19.303) part1 
 
Link:https://gitee.com/openeuler/kernel/pulls/3862

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 6ccec634 be7367b3

arch/arm64/include/asm/pgtable.h

+6 −0
Original line number Diff line number Diff line
@@ -610,6 +610,12 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
	if (pte_hw_dirty(pte))

		pte = pte_mkdirty(pte);

	pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);

	/*

	 * If we end up clearing hw dirtiness for a sw-dirty PTE, set hardware

	 * dirtiness again.

	 */

	if (pte_sw_dirty(pte))

		pte = pte_mkdirty(pte);

	return pte;

}

arch/x86/kernel/cpu/amd.c

+3 −0
Original line number Diff line number Diff line
@@ -1249,6 +1249,9 @@ static void zenbleed_check_cpu(void *unused) 


void amd_check_microcode(void)

{

	if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)

		return;



	on_each_cpu(zenbleed_check_cpu, NULL, 1);

}

drivers/pci/hotplug/acpiphp_glue.c

+3 −6
Original line number Diff line number Diff line
@@ -502,15 +502,12 @@ static void enable_slot(struct acpiphp_slot *slot, bool bridge) 
				if (pass && dev->subordinate) {

					check_hotplug_bridge(slot, dev);

					pcibios_resource_survey_bus(dev->subordinate);

					if (pci_is_root_bus(bus))

						__pci_bus_size_bridges(dev->subordinate, &add_list);

					__pci_bus_size_bridges(dev->subordinate,

							       &add_list);

				}

			}

		}

		if (pci_is_root_bus(bus))

		__pci_bus_assign_resources(bus, &add_list, NULL);

		else

			pci_assign_unassigned_bridge_resources(bus->self);

	}



	acpiphp_sanitize_bus(bus);

include/asm-generic/qspinlock.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static __always_inline int queued_spin_is_locked(struct qspinlock *lock) 
 */

static __always_inline int queued_spin_value_unlocked(struct qspinlock lock)

{

	return !atomic_read(&lock.val);

	return !lock.val.counter;

}



/**

kernel/audit_watch.c

+8 −1
Original line number Diff line number Diff line
@@ -557,11 +557,18 @@ int audit_exe_compare(struct task_struct *tsk, struct audit_fsnotify_mark *mark) 
	unsigned long ino;

	dev_t dev;



	exe_file = get_task_exe_file(tsk);

	/* only do exe filtering if we are recording @current events/records */

	if (tsk != current)

		return 0;



	if (!current->mm)

		return 0;

	exe_file = get_mm_exe_file(current->mm);

	if (!exe_file)

		return 0;

	ino = file_inode(exe_file)->i_ino;

	dev = file_inode(exe_file)->i_sb->s_dev;

	fput(exe_file);



	return audit_mark_compare(mark, ino, dev);

}