Skip to content

Commit 99bb3fa

Browse files
nathanchancenathanchance
committed
Merge 4.14.175 into kernel.lnx.4.14.r4-rel
Changes in 4.14.175: (149 commits) spi: qup: call spi_qup_pm_resume_runtime before suspending powerpc: Include .BTF section ARM: dts: dra7: Add "dma-ranges" property to PCIe RC DT nodes spi: pxa2xx: Add CS control clock quirk spi/zynqmp: remove entry that causes a cs glitch drm/exynos: dsi: propagate error value and silence meaningless warning drm/exynos: dsi: fix workaround for the legacy clock name drivers/perf: arm_pmu_acpi: Fix incorrect checking of gicc pointer altera-stapl: altera_get_note: prevent write beyond end of 'key' dm bio record: save/restore bi_end_io and bi_integrity xenbus: req->body should be updated before req->state xenbus: req->err should be updated before req->state block, bfq: fix overwrite of bfq_group pointer in bfq_find_set_group() parse-maintainers: Mark as executable USB: Disable LPM on WD19's Realtek Hub usb: quirks: add NO_LPM quirk for RTL8153 based ethernet adapters USB: serial: option: add ME910G1 ECM composition 0x110b usb: host: xhci-plat: add a shutdown USB: serial: pl2303: add device-id for HP LD381 usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c ALSA: line6: Fix endless MIDI read loop ALSA: seq: virmidi: Fix running status after receiving sysex ALSA: seq: oss: Fix running status after receiving sysex ALSA: pcm: oss: Avoid plugin buffer overflow ALSA: pcm: oss: Remove WARNING from snd_pcm_plug_alloc() checks iio: trigger: stm32-timer: disable master mode when stopping iio: magnetometer: ak8974: Fix negative raw values in sysfs mmc: sdhci-of-at91: fix cd-gpios for SAMA5D2 staging: rtl8188eu: Add device id for MERCUSYS MW150US v2 staging/speakup: fix get_word non-space look-ahead intel_th: Fix user-visible error codes intel_th: pci: Add Elkhart Lake CPU support rtc: max8907: add missing select REGMAP_IRQ xhci: Do not open code __print_symbolic() in xhci trace events memcg: fix NULL pointer dereference in __mem_cgroup_usage_unregister_event mm: slub: be more careful about the double cmpxchg of freelist mm, slub: prevent kmalloc_node crashes and memory leaks page-flags: fix a crash at SetPageError(THP_SWAP) x86/mm: split vmalloc_sync_all() USB: cdc-acm: fix close_delay and closing_wait units in TIOCSSERIAL USB: cdc-acm: fix rounding error in TIOCSSERIAL iio: adc: at91-sama5d2_adc: fix channel configuration for differential channels iio: adc: at91-sama5d2_adc: fix differential channels in triggered mode kbuild: Disable -Wpointer-to-enum-cast futex: Fix inode life-time issue futex: Unbreak futex hashing Revert "vrf: mark skb for multicast or link-local as enslaved to VRF" Revert "ipv6: Fix handling of LLA with VRF and sockets bound to VRF" ALSA: hda/realtek: Fix pop noise on ALC225 arm64: smp: fix smp_send_stop() behaviour arm64: smp: fix crash_smp_send_stop() behaviour drm/bridge: dw-hdmi: fix AVI frame colorimetry staging: greybus: loopback_test: fix potential path truncation staging: greybus: loopback_test: fix potential path truncations Revert "drm/dp_mst: Skip validating ports during destruction, just ref" hsr: fix general protection fault in hsr_addr_is_self() macsec: restrict to ethernet devices net: dsa: Fix duplicate frames flooded by learning net: mvneta: Fix the case where the last poll did not process all rx net/packet: tpacket_rcv: avoid a producer race condition net: qmi_wwan: add support for ASKEY WWHC050 net_sched: cls_route: remove the right filter from hashtable net_sched: keep alloc_hash updated after hash allocation net: stmmac: dwmac-rk: fix error path in rk_gmac_probe NFC: fdp: Fix a signedness bug in fdp_nci_send_patch() slcan: not call free_netdev before rtnl_unlock in slcan_open bnxt_en: fix memory leaks in bnxt_dcbnl_ieee_getets() net: dsa: mt7530: Change the LINK bit to reflect the link status vxlan: check return value of gro_cells_init() hsr: use rcu_read_lock() in hsr_get_node_{list/status}() hsr: add restart routine into hsr_get_node_list() hsr: set .netnsok flag net: ipv4: don't let PMTU updates increase route MTU cgroup-v1: cgroup_pidlist_next should update position index cpupower: avoid multiple definition with gcc -fno-common drivers/of/of_mdio.c:fix of_mdiobus_register() cgroup1: don't call release_agent when it is "" dt-bindings: net: FMan erratum A050385 arm64: dts: ls1043a: FMan erratum A050385 fsl/fman: detect FMan erratum A050385 scsi: ipr: Fix softlockup when rescanning devices in petitboot mac80211: Do not send mesh HWMP PREQ if HWMP is disabled dpaa_eth: Remove unnecessary boolean expression in dpaa_get_headroom sxgbe: Fix off by one in samsung driver strncpy size arg arm64: ptrace: map SPSR_ELx<->PSR for compat tasks arm64: compat: map SPSR_ELx<->PSR for signals ftrace/x86: Anotate text_mutex split between ftrace_arch_code_modify_post_process() and ftrace_arch_code_modify_prepare() i2c: hix5hd2: add missed clk_disable_unprepare in remove Input: synaptics - enable RMI on HP Envy 13-ad105ng Input: avoid BIT() macro usage in the serio.h UAPI header ARM: dts: dra7: Add bus_dma_limit for L3 bus ARM: dts: omap5: Add bus_dma_limit for L3 bus perf probe: Do not depend on dwfl_module_addrsym() tools: Let O= makes handle a relative path with -C option scripts/dtc: Remove redundant YYLOC global declaration scsi: sd: Fix optimal I/O size for devices that change reported values mac80211: mark station unauthorized before key removal gpiolib: acpi: Correct comment for HP x2 10 honor_wakeup quirk gpiolib: acpi: Rework honor_wakeup option into an ignore_wake option gpiolib: acpi: Add quirk to ignore EC wakeups on HP x2 10 BYT + AXP288 model RDMA/core: Ensure security pkey modify is not lost genirq: Fix reference leaks on irq affinity notifiers xfrm: handle NETDEV_UNREGISTER for xfrm device vti[6]: fix packet tx through bpf_redirect() in XinY cases RDMA/mlx5: Block delay drop to unprivileged users xfrm: fix uctx len check in verify_sec_ctx_len xfrm: add the missing verify_sec_ctx_len check in xfrm_add_acquire xfrm: policy: Fix doulbe free in xfrm_policy_timer netfilter: nft_fwd_netdev: validate family and chain type vti6: Fix memory leak of skb if input policy check fails Input: raydium_i2c_ts - use true and false for boolean values Input: raydium_i2c_ts - fix error codes in raydium_i2c_boot_trigger() afs: Fix some tracing details USB: serial: option: add support for ASKEY WWHC050 USB: serial: option: add BroadMobi BM806U USB: serial: option: add Wistron Neweb D19Q1 USB: cdc-acm: restore capability check order USB: serial: io_edgeport: fix slab-out-of-bounds read in edge_interrupt_callback usb: musb: fix crash with highmen PIO and usbmon media: flexcop-usb: fix endpoint sanity check media: usbtv: fix control-message timeouts staging: rtl8188eu: Add ASUS USB-N10 Nano B1 to device table staging: wlan-ng: fix ODEBUG bug in prism2sta_disconnect_usb staging: wlan-ng: fix use-after-free Read in hfa384x_usbin_callback libfs: fix infoleak in simple_attr_read() media: ov519: add missing endpoint sanity checks media: dib0700: fix rc endpoint lookup media: stv06xx: add missing descriptor sanity checks media: xirlink_cit: add missing descriptor sanity checks mac80211: Check port authorization in the ieee80211_tx_dequeue() case mac80211: fix authentication with iwlwifi/mvm vt: selection, introduce vc_is_sel vt: ioctl, switch VT_IS_IN_USE and VT_BUSY to inlines vt: switch vt_dont_switch to bool vt: vt_ioctl: remove unnecessary console allocation checks vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console vt: vt_ioctl: fix use-after-free in vt_in_use() platform/x86: pmc_atom: Add Lex 2I385SW to critclk_systems DMI table bpf: Explicitly memset the bpf_attr structure bpf: Explicitly memset some bpf info structures declared on the stack gpiolib: acpi: Add quirk to ignore EC wakeups on HP x2 10 CHT + AXP288 model net: ks8851-ml: Fix IO operations, again arm64: alternative: fix build with clang integrated assembler perf map: Fix off by one in strncpy() size argument ARM: dts: oxnas: Fix clear-mask property ARM: bcm2835-rpi-zero-w: Add missing pinctrl name arm64: dts: ls1043a-rdb: correct RGMII delay mode to rgmii-id arm64: dts: ls1046ardb: set RGMII interfaces to RGMII_ID mode Linux 4.14.175 Signed-off-by: Nathan Chancellor <[email protected]> Conflicts: arch/arm64/kernel/smp.c drivers/scsi/sd.c
2 parents 1c0cab2 + 4520f06 commit 99bb3fa

File tree

147 files changed

+1096
-436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+1096
-436
lines changed

Diff for: ‎Documentation/devicetree/bindings/net/fsl-fman.txt

+7
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,13 @@ PROPERTIES
110110
Usage: required
111111
Definition: See soc/fsl/qman.txt and soc/fsl/bman.txt
112112

113+
- fsl,erratum-a050385
114+
Usage: optional
115+
Value type: boolean
116+
Definition: A boolean property. Indicates the presence of the
117+
erratum A050385 which indicates that DMA transactions that are
118+
split can result in a FMan lock.
119+
113120
=============================================================================
114121
FMan MURAM Node
115122

Diff for: ‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 4
33
PATCHLEVEL = 14
4-
SUBLEVEL = 174
4+
SUBLEVEL = 175
55
EXTRAVERSION =
66
NAME = Petit Gorille
77

Diff for: ‎arch/arm/boot/dts/bcm2835-rpi-zero-w.dts

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
&sdhci {
119119
#address-cells = <1>;
120120
#size-cells = <0>;
121+
pinctrl-names = "default";
121122
pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>;
122123
mmc-pwrseq = <&wifi_pwrseq>;
123124
non-removable;

Diff for: ‎arch/arm/boot/dts/dra7.dtsi

+3
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
#address-cells = <1>;
138138
#size-cells = <1>;
139139
ranges = <0x0 0x0 0x0 0xc0000000>;
140+
dma-ranges = <0x80000000 0x0 0x80000000 0x80000000>;
140141
ti,hwmods = "l3_main_1", "l3_main_2";
141142
reg = <0x0 0x44000000 0x0 0x1000000>,
142143
<0x0 0x45000000 0x0 0x1000>;
@@ -302,6 +303,7 @@
302303
device_type = "pci";
303304
ranges = <0x81000000 0 0 0x03000 0 0x00010000
304305
0x82000000 0 0x20013000 0x13000 0 0xffed000>;
306+
dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;
305307
bus-range = <0x00 0xff>;
306308
#interrupt-cells = <1>;
307309
num-lanes = <1>;
@@ -356,6 +358,7 @@
356358
device_type = "pci";
357359
ranges = <0x81000000 0 0 0x03000 0 0x00010000
358360
0x82000000 0 0x30013000 0x13000 0 0xffed000>;
361+
dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;
359362
bus-range = <0x00 0xff>;
360363
#interrupt-cells = <1>;
361364
num-lanes = <1>;

Diff for: ‎arch/arm/boot/dts/omap5.dtsi

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
#address-cells = <1>;
132132
#size-cells = <1>;
133133
ranges = <0 0 0 0xc0000000>;
134+
dma-ranges = <0x80000000 0x0 0x80000000 0x80000000>;
134135
ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";
135136
reg = <0 0x44000000 0 0x2000>,
136137
<0 0x44800000 0 0x3000>,

Diff for: ‎arch/arm/boot/dts/ox810se.dtsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,8 @@
322322
interrupt-controller;
323323
reg = <0 0x200>;
324324
#interrupt-cells = <1>;
325-
valid-mask = <0xFFFFFFFF>;
326-
clear-mask = <0>;
325+
valid-mask = <0xffffffff>;
326+
clear-mask = <0xffffffff>;
327327
};
328328

329329
timer0: timer@200 {

Diff for: ‎arch/arm/boot/dts/ox820.dtsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@
239239
reg = <0 0x200>;
240240
interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
241241
#interrupt-cells = <1>;
242-
valid-mask = <0xFFFFFFFF>;
243-
clear-mask = <0>;
242+
valid-mask = <0xffffffff>;
243+
clear-mask = <0xffffffff>;
244244
};
245245

246246
timer0: timer@200 {

Diff for: ‎arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
};
2222

2323
&fman0 {
24+
fsl,erratum-a050385;
25+
2426
/* these aliases provide the FMan ports mapping */
2527
enet0: ethernet@e0000 {
2628
};

Diff for: ‎arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,12 @@
155155

156156
ethernet@e4000 {
157157
phy-handle = <&rgmii_phy1>;
158-
phy-connection-type = "rgmii-txid";
158+
phy-connection-type = "rgmii-id";
159159
};
160160

161161
ethernet@e6000 {
162162
phy-handle = <&rgmii_phy2>;
163-
phy-connection-type = "rgmii-txid";
163+
phy-connection-type = "rgmii-id";
164164
};
165165

166166
ethernet@e8000 {

Diff for: ‎arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,12 @@
162162
&fman0 {
163163
ethernet@e4000 {
164164
phy-handle = <&rgmii_phy1>;
165-
phy-connection-type = "rgmii";
165+
phy-connection-type = "rgmii-id";
166166
};
167167

168168
ethernet@e6000 {
169169
phy-handle = <&rgmii_phy2>;
170-
phy-connection-type = "rgmii";
170+
phy-connection-type = "rgmii-id";
171171
};
172172

173173
ethernet@e8000 {

Diff for: ‎arch/arm64/include/asm/alternative.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ alternative_endif
216216

217217
.macro user_alt, label, oldinstr, newinstr, cond
218218
9999: alternative_insn "\oldinstr", "\newinstr", \cond
219-
_ASM_EXTABLE 9999b, \label
219+
_asm_extable 9999b, \label
220220
.endm
221221

222222
/*

Diff for: ‎arch/arm64/kernel/ptrace.c

+2
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,7 @@ static int compat_gpr_get(struct task_struct *target,
833833
break;
834834
case 16:
835835
reg = task_pt_regs(target)->pstate;
836+
reg = pstate_to_compat_psr(reg);
836837
break;
837838
case 17:
838839
reg = task_pt_regs(target)->orig_x0;
@@ -900,6 +901,7 @@ static int compat_gpr_set(struct task_struct *target,
900901
newregs.pc = reg;
901902
break;
902903
case 16:
904+
reg = compat_psr_to_pstate(reg);
903905
newregs.pstate = reg;
904906
break;
905907
case 17:

Diff for: ‎arch/arm64/kernel/signal32.c

+6-2
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ static int compat_restore_sigframe(struct pt_regs *regs,
321321
int err;
322322
sigset_t set;
323323
struct compat_aux_sigframe __user *aux;
324+
unsigned long psr;
324325

325326
err = get_sigset_t(&set, &sf->uc.uc_sigmask);
326327
if (err == 0) {
@@ -344,7 +345,9 @@ static int compat_restore_sigframe(struct pt_regs *regs,
344345
__get_user_error(regs->compat_sp, &sf->uc.uc_mcontext.arm_sp, err);
345346
__get_user_error(regs->compat_lr, &sf->uc.uc_mcontext.arm_lr, err);
346347
__get_user_error(regs->pc, &sf->uc.uc_mcontext.arm_pc, err);
347-
__get_user_error(regs->pstate, &sf->uc.uc_mcontext.arm_cpsr, err);
348+
__get_user_error(psr, &sf->uc.uc_mcontext.arm_cpsr, err);
349+
350+
regs->pstate = compat_psr_to_pstate(psr);
348351

349352
/*
350353
* Avoid compat_sys_sigreturn() restarting.
@@ -500,6 +503,7 @@ static int compat_setup_sigframe(struct compat_sigframe __user *sf,
500503
struct pt_regs *regs, sigset_t *set)
501504
{
502505
struct compat_aux_sigframe __user *aux;
506+
unsigned long psr = pstate_to_compat_psr(regs->pstate);
503507
int err = 0;
504508

505509
__put_user_error(regs->regs[0], &sf->uc.uc_mcontext.arm_r0, err);
@@ -518,7 +522,7 @@ static int compat_setup_sigframe(struct compat_sigframe __user *sf,
518522
__put_user_error(regs->compat_sp, &sf->uc.uc_mcontext.arm_sp, err);
519523
__put_user_error(regs->compat_lr, &sf->uc.uc_mcontext.arm_lr, err);
520524
__put_user_error(regs->pc, &sf->uc.uc_mcontext.arm_pc, err);
521-
__put_user_error(regs->pstate, &sf->uc.uc_mcontext.arm_cpsr, err);
525+
__put_user_error(psr, &sf->uc.uc_mcontext.arm_cpsr, err);
522526

523527
__put_user_error((compat_ulong_t)0, &sf->uc.uc_mcontext.trap_no, err);
524528
/* set the compat FSR WnR */

Diff for: ‎arch/arm64/kernel/smp.c

+21-6
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ static void ipi_cpu_stop(unsigned int cpu, struct pt_regs *regs)
829829
raw_spin_unlock(&stop_lock);
830830
}
831831

832-
set_cpu_active(cpu, false);
832+
set_cpu_online(cpu, false);
833833

834834
flush_cache_all();
835835
local_irq_disable();
@@ -948,11 +948,22 @@ void tick_broadcast(const struct cpumask *mask)
948948
}
949949
#endif
950950

951+
/*
952+
* The number of CPUs online, not counting this CPU (which may not be
953+
* fully online and so not counted in num_online_cpus()).
954+
*/
955+
static inline unsigned int num_other_online_cpus(void)
956+
{
957+
unsigned int this_cpu_online = cpu_online(smp_processor_id());
958+
959+
return num_online_cpus() - this_cpu_online;
960+
}
961+
951962
void smp_send_stop(void)
952963
{
953964
unsigned long timeout;
954965

955-
if (num_online_cpus() > 1) {
966+
if (num_other_online_cpus()) {
956967
cpumask_t mask;
957968

958969
cpumask_copy(&mask, cpu_online_mask);
@@ -965,10 +976,10 @@ void smp_send_stop(void)
965976

966977
/* Wait up to one second for other CPUs to stop */
967978
timeout = USEC_PER_SEC;
968-
while (num_active_cpus() > 1 && timeout--)
979+
while (num_other_online_cpus() && timeout--)
969980
udelay(1);
970981

971-
if (num_active_cpus() > 1)
982+
if (num_other_online_cpus())
972983
pr_warning("SMP: failed to stop secondary CPUs %*pbl\n",
973984
cpumask_pr_args(cpu_online_mask));
974985
}
@@ -989,13 +1000,17 @@ void crash_smp_send_stop(void)
9891000

9901001
cpus_stopped = 1;
9911002

992-
if (num_online_cpus() == 1)
1003+
/*
1004+
* If this cpu is the only one alive at this point in time, online or
1005+
* not, there are no stop messages to be sent around, so just back out.
1006+
*/
1007+
if (num_other_online_cpus() == 0)
9931008
return;
9941009

9951010
cpumask_copy(&mask, cpu_online_mask);
9961011
cpumask_clear_cpu(smp_processor_id(), &mask);
9971012

998-
atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1);
1013+
atomic_set(&waiting_for_crash_ipi, num_other_online_cpus());
9991014

10001015
pr_crit("SMP: stopping secondary CPUs\n");
10011016
smp_cross_call(&mask, IPI_CPU_CRASH_STOP);

Diff for: ‎arch/powerpc/kernel/vmlinux.lds.S

+6
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,12 @@ SECTIONS
317317
*(.branch_lt)
318318
}
319319

320+
#ifdef CONFIG_DEBUG_INFO_BTF
321+
.BTF : AT(ADDR(.BTF) - LOAD_OFFSET) {
322+
*(.BTF)
323+
}
324+
#endif
325+
320326
.opd : AT(ADDR(.opd) - LOAD_OFFSET) {
321327
*(.opd)
322328
}

Diff for: ‎arch/x86/kernel/ftrace.c

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#ifdef CONFIG_DYNAMIC_FTRACE
3737

3838
int ftrace_arch_code_modify_prepare(void)
39+
__acquires(&text_mutex)
3940
{
4041
mutex_lock(&text_mutex);
4142
set_kernel_text_rw();
@@ -44,6 +45,7 @@ int ftrace_arch_code_modify_prepare(void)
4445
}
4546

4647
int ftrace_arch_code_modify_post_process(void)
48+
__releases(&text_mutex)
4749
{
4850
set_all_modules_text_ro();
4951
set_kernel_text_ro();

Diff for: ‎arch/x86/mm/fault.c

+24-2
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address)
272272
return pmd_k;
273273
}
274274

275-
void vmalloc_sync_all(void)
275+
static void vmalloc_sync(void)
276276
{
277277
unsigned long address;
278278

@@ -299,6 +299,16 @@ void vmalloc_sync_all(void)
299299
}
300300
}
301301

302+
void vmalloc_sync_mappings(void)
303+
{
304+
vmalloc_sync();
305+
}
306+
307+
void vmalloc_sync_unmappings(void)
308+
{
309+
vmalloc_sync();
310+
}
311+
302312
/*
303313
* 32-bit:
304314
*
@@ -401,11 +411,23 @@ static void dump_pagetable(unsigned long address)
401411

402412
#else /* CONFIG_X86_64: */
403413

404-
void vmalloc_sync_all(void)
414+
void vmalloc_sync_mappings(void)
405415
{
416+
/*
417+
* 64-bit mappings might allocate new p4d/pud pages
418+
* that need to be propagated to all tasks' PGDs.
419+
*/
406420
sync_global_pgds(VMALLOC_START & PGDIR_MASK, VMALLOC_END);
407421
}
408422

423+
void vmalloc_sync_unmappings(void)
424+
{
425+
/*
426+
* Unmappings never allocate or free p4d/pud pages.
427+
* No work is required here.
428+
*/
429+
}
430+
409431
/*
410432
* 64-bit:
411433
*

Diff for: ‎block/bfq-cgroup.c

+5-4
Original file line numberDiff line numberDiff line change
@@ -499,12 +499,13 @@ struct bfq_group *bfq_find_set_group(struct bfq_data *bfqd,
499499
*/
500500
entity = &bfqg->entity;
501501
for_each_entity(entity) {
502-
bfqg = container_of(entity, struct bfq_group, entity);
503-
if (bfqg != bfqd->root_group) {
504-
parent = bfqg_parent(bfqg);
502+
struct bfq_group *curr_bfqg = container_of(entity,
503+
struct bfq_group, entity);
504+
if (curr_bfqg != bfqd->root_group) {
505+
parent = bfqg_parent(curr_bfqg);
505506
if (!parent)
506507
parent = bfqd->root_group;
507-
bfq_group_set_parent(bfqg, parent);
508+
bfq_group_set_parent(curr_bfqg, parent);
508509
}
509510
}
510511

Diff for: ‎drivers/acpi/apei/ghes.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ static int ghes_estatus_pool_expand(unsigned long len)
201201
* New allocation must be visible in all pgd before it can be found by
202202
* an NMI allocating from the pool.
203203
*/
204-
vmalloc_sync_all();
204+
vmalloc_sync_mappings();
205205

206206
return gen_pool_add(ghes_estatus_pool, addr, PAGE_ALIGN(len), -1);
207207
}

0 commit comments

Comments
 (0)