Merge 5.10.14 into android12-5.10
Changes in 5.10.14 net: dsa: microchip: Adjust reset release timing to match reference reset circuit net: stmmac: dwmac-intel-plat: remove config data on error net: fec: put child node on error path net: octeontx2: Make sure the buffer is 128 byte aligned stmmac: intel: Configure EHL PSE0 GbE and PSE1 GbE to 32 bits DMA addressing mlxsw: spectrum_span: Do not overwrite policer configuration net: dsa: bcm_sf2: put device node before return net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP ibmvnic: Ensure that CRQ entry read are correctly ordered iommu/io-pgtable-arm: Support coherency for Mali LPAE drm/panfrost: Support cache-coherent integrations arm64: dts: meson: Describe G12b GPU as coherent arm64: Fix kernel address detection of __is_lm_address() arm64: Do not pass tagged addresses to __is_lm_address() Revert "x86/setup: don't remove E820_TYPE_RAM for pfn 0" ARM: 9025/1: Kconfig: CPU_BIG_ENDIAN depends on !LD_IS_LLD iommu/vt-d: Do not use flush-queue when caching-mode is on phy: cpcap-usb: Fix warning for missing regulator_disable tools/power/x86/intel-speed-select: Set scaling_max_freq to base_frequency tools/power/x86/intel-speed-select: Set higher of cpuinfo_max_freq or base_frequency platform/x86: touchscreen_dmi: Add swap-x-y quirk for Goodix touchscreen on Estar Beauty HD tablet platform/x86: intel-vbtn: Support for tablet mode on Dell Inspiron 7352 habanalabs: fix dma_addr passed to dma_mmap_coherent locking/lockdep: Avoid noinstr warning for DEBUG_LOCKDEP x86: __always_inline __{rd,wr}msr() scsi: scsi_transport_srp: Don't block target in failfast state scsi: libfc: Avoid invoking response handler twice if ep is already completed scsi: fnic: Fix memleak in vnic_dev_init_devcmd2 ASoC: SOF: Intel: hda: Resume codec to do jack detection ALSA: hda: Add AlderLake-P PCI ID and HDMI codec vid objtool: Don't add empty symbols to the rbtree mac80211: fix incorrect strlen of .write in debugfs mac80211: fix fast-rx encryption check mac80211: fix encryption key selection for 802.3 xmit scsi: ibmvfc: Set default timeout to avoid crash during migration ALSA: hda: Add Cometlake-R PCI ID i2c: tegra: Create i2c_writesl_vi() to use with VI I2C for filling TX FIFO udf: fix the problem that the disc content is not displayed nvme: check the PRINFO bit before deciding the host buffer length nvme-rdma: avoid request double completion for concurrent nvme_rdma_timeout nvme-tcp: avoid request double completion for concurrent nvme_tcp_timeout nvme-pci: allow use of cmb on v1.4 controllers nvmet: set right status on error in id-ns handler platform/x86: thinkpad_acpi: Add P53/73 firmware to fan_quirk_table for dual fan control selftests/powerpc: Only test lwm/stmw on big endian drm/amd/display: Update dram_clock_change_latency for DCN2.1 drm/amd/display: Allow PSTATE chnage when no displays are enabled drm/amd/display: Change function decide_dp_link_settings to avoid infinite looping drm/amd/display: Use hardware sequencer functions for PG control drm/amd/display: Fixed corruptions on HPDRX link loss restore habanalabs: zero pci counters packet before submit to FW habanalabs: fix backward compatibility of idle check habanalabs: disable FW events on device removal objtool: Don't fail the kernel build on fatal errors x86/cpu: Add another Alder Lake CPU to the Intel family kthread: Extract KTHREAD_IS_PER_CPU workqueue: Restrict affinity change to rescuer Linux 5.10.14 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I14bb472e4128e97ea84e91547b9223d1157b93c8
This commit is contained in:
@@ -5271,12 +5271,15 @@ static void __lock_unpin_lock(struct lockdep_map *lock, struct pin_cookie cookie
|
||||
/*
|
||||
* Check whether we follow the irq-flags state precisely:
|
||||
*/
|
||||
static void check_flags(unsigned long flags)
|
||||
static noinstr void check_flags(unsigned long flags)
|
||||
{
|
||||
#if defined(CONFIG_PROVE_LOCKING) && defined(CONFIG_DEBUG_LOCKDEP)
|
||||
if (!debug_locks)
|
||||
return;
|
||||
|
||||
/* Get the warning out.. */
|
||||
instrumentation_begin();
|
||||
|
||||
if (irqs_disabled_flags(flags)) {
|
||||
if (DEBUG_LOCKS_WARN_ON(lockdep_hardirqs_enabled())) {
|
||||
printk("possible reason: unannotated irqs-off.\n");
|
||||
@@ -5304,6 +5307,8 @@ static void check_flags(unsigned long flags)
|
||||
|
||||
if (!debug_locks)
|
||||
print_irqtrace_events(current);
|
||||
|
||||
instrumentation_end();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user