1 жил өмнө · 477f5e6b9e
--- a/Documentation/filesystems/autofs-mount-control.rst
+++ b/Documentation/filesystems/autofs-mount-control.rst
@@ -196,7 +196,7 @@ information and return operation results::
 
				 		    struct args_ismountpoint	ismountpoint;
			
 
				 	    };
			
 
				 
			
 
				-	    char path[0];
			
 
				+	    char path[];
			
 
				     };
			
 
				 
			
 
				 The ioctlfd field is a mount point file descriptor of an autofs mount
			
--- a/Documentation/filesystems/autofs.rst
+++ b/Documentation/filesystems/autofs.rst
@@ -467,7 +467,7 @@ Each ioctl is passed a pointer to an `autofs_dev_ioctl` structure::
 
				 			struct args_ismountpoint	ismountpoint;
			
 
				 		};
			
 
				 
			
 
				-                char path[0];
			
 
				+                char path[];
			
 
				         };
			
 
				 
			
 
				 For the **OPEN_MOUNT** and **IS_MOUNTPOINT** commands, the target
			
--- a/Documentation/filesystems/directory-locking.rst
+++ b/Documentation/filesystems/directory-locking.rst
@@ -22,12 +22,11 @@ exclusive.
 
				 3) object removal.  Locking rules: caller locks parent, finds victim,
			
 
				 locks victim and calls the method.  Locks are exclusive.
			
 
				 
			
 
				-4) rename() that is _not_ cross-directory.  Locking rules: caller locks
			
 
				-the parent and finds source and target.  In case of exchange (with
			
 
				-RENAME_EXCHANGE in flags argument) lock both.  In any case,
			
 
				-if the target already exists, lock it.  If the source is a non-directory,
			
 
				-lock it.  If we need to lock both, lock them in inode pointer order.
			
 
				-Then call the method.  All locks are exclusive.
			
 
				+4) rename() that is _not_ cross-directory.  Locking rules: caller locks the
			
 
				+parent and finds source and target.  We lock both (provided they exist).  If we
			
 
				+need to lock two inodes of different type (dir vs non-dir), we lock directory
			
 
				+first.  If we need to lock two inodes of the same type, lock them in inode
			
 
				+pointer order.  Then call the method.  All locks are exclusive.
			
 
				 NB: we might get away with locking the source (and target in exchange
			
 
				 case) shared.
			
 
				 
			
@@ -44,15 +43,17 @@ All locks are exclusive.
 
				 rules:
			
 
				 
			
 
				 	* lock the filesystem
			
 
				-	* lock parents in "ancestors first" order.
			
 
				+	* lock parents in "ancestors first" order. If one is not ancestor of
			
 
				+	  the other, lock them in inode pointer order.
			
 
				 	* find source and target.
			
 
				 	* if old parent is equal to or is a descendent of target
			
 
				 	  fail with -ENOTEMPTY
			
 
				 	* if new parent is equal to or is a descendent of source
			
 
				 	  fail with -ELOOP
			
 
				-	* If it's an exchange, lock both the source and the target.
			
 
				-	* If the target exists, lock it.  If the source is a non-directory,
			
 
				-	  lock it.  If we need to lock both, do so in inode pointer order.
			
 
				+	* Lock both the source and the target provided they exist. If we
			
 
				+	  need to lock two inodes of different type (dir vs non-dir), we lock
			
 
				+	  the directory first. If we need to lock two inodes of the same type,
			
 
				+	  lock them in inode pointer order.
			
 
				 	* call the method.
			
 
				 
			
 
				 All ->i_rwsem are taken exclusive.  Again, we might get away with locking
			
@@ -66,8 +67,9 @@ If no directory is its own ancestor, the scheme above is deadlock-free.
 
				 
			
 
				 Proof:
			
 
				 
			
 
				-	First of all, at any moment we have a partial ordering of the
			
 
				-	objects - A < B iff A is an ancestor of B.
			
 
				+	First of all, at any moment we have a linear ordering of the
			
 
				+	objects - A < B iff (A is an ancestor of B) or (B is not an ancestor
			
 
				+        of A and ptr(A) < ptr(B)).
			
 
				 
			
 
				 	That ordering can change.  However, the following is true:
			
 
				 
			
--- a/Documentation/networking/af_xdp.rst
+++ b/Documentation/networking/af_xdp.rst
@@ -433,6 +433,15 @@ start N bytes into the buffer leaving the first N bytes for the
 
				 application to use. The final option is the flags field, but it will
			
 
				 be dealt with in separate sections for each UMEM flag.
			
 
				 
			
 
				+SO_BINDTODEVICE setsockopt
			
 
				+--------------------------
			
 
				+
			
 
				+This is a generic SOL_SOCKET option that can be used to tie AF_XDP
			
 
				+socket to a particular network interface.  It is useful when a socket
			
 
				+is created by a privileged process and passed to a non-privileged one.
			
 
				+Once the option is set, kernel will refuse attempts to bind that socket
			
 
				+to a different interface.  Updating the value requires CAP_NET_RAW.
			
 
				+
			
 
				 XDP_STATISTICS getsockopt
			
 
				 -------------------------
			
 
				 
			
--- a/Documentation/networking/ip-sysctl.rst
+++ b/Documentation/networking/ip-sysctl.rst
@@ -711,6 +711,31 @@ tcp_syncookies - INTEGER
 
				 	network connections you can set this knob to 2 to enable
			
 
				 	unconditionally generation of syncookies.
			
 
				 
			
 
				+tcp_migrate_req - BOOLEAN
			
 
				+	The incoming connection is tied to a specific listening socket when
			
 
				+	the initial SYN packet is received during the three-way handshake.
			
 
				+	When a listener is closed, in-flight request sockets during the
			
 
				+	handshake and established sockets in the accept queue are aborted.
			
 
				+
			
 
				+	If the listener has SO_REUSEPORT enabled, other listeners on the
			
 
				+	same port should have been able to accept such connections. This
			
 
				+	option makes it possible to migrate such child sockets to another
			
 
				+	listener after close() or shutdown().
			
 
				+
			
 
				+	The BPF_SK_REUSEPORT_SELECT_OR_MIGRATE type of eBPF program should
			
 
				+	usually be used to define the policy to pick an alive listener.
			
 
				+	Otherwise, the kernel will randomly pick an alive listener only if
			
 
				+	this option is enabled.
			
 
				+
			
 
				+	Note that migration between listeners with different settings may
			
 
				+	crash applications. Let's say migration happens from listener A to
			
 
				+	B, and only B has TCP_SAVE_SYN enabled. B cannot read SYN data from
			
 
				+	the requests migrated from A. To avoid such a situation, cancel
			
 
				+	migration by returning SK_DROP in the type of eBPF program, or
			
 
				+	disable this option.
			
 
				+
			
 
				+	Default: 0
			
 
				+
			
 
				 tcp_fastopen - INTEGER
			
 
				 	Enable TCP Fast Open (RFC7413) to send and accept data in the opening
			
 
				 	SYN packet.
			
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 
				 # SPDX-License-Identifier: GPL-2.0
			
 
				 VERSION = 5
			
 
				 PATCHLEVEL = 10
			
 
				-SUBLEVEL = 187
			
 
				+SUBLEVEL = 188
			
 
				 EXTRAVERSION =
			
 
				 NAME = Dare mighty things
			
 
				 
			
--- a/arch/alpha/include/asm/pgtable.h
+++ b/arch/alpha/include/asm/pgtable.h
@@ -241,8 +241,10 @@ pmd_page_vaddr(pmd_t pmd)
 
				 #define pud_page(pud)	(mem_map + ((pud_val(pud) & _PFN_MASK) >> 32))
			
 
				 #endif
			
 
				 
			
 
				-extern inline unsigned long pud_page_vaddr(pud_t pgd)
			
 
				-{ return PAGE_OFFSET + ((pud_val(pgd) & _PFN_MASK) >> (32-PAGE_SHIFT)); }
			
 
				+extern inline pmd_t *pud_pgtable(pud_t pgd)
			
 
				+{
			
 
				+	return (pmd_t *)(PAGE_OFFSET + ((pud_val(pgd) & _PFN_MASK) >> (32-PAGE_SHIFT)));
			
 
				+}
			
 
				 
			
 
				 extern inline int pte_none(pte_t pte)		{ return !pte_val(pte); }
			
 
				 extern inline int pte_present(pte_t pte)	{ return pte_val(pte) & _PAGE_VALID; }
			
@@ -292,7 +294,7 @@ extern inline pte_t pte_mkyoung(pte_t pte)	{ pte_val(pte) |= __ACCESS_BITS; retu
 
				 /* Find an entry in the second-level page table.. */
			
 
				 extern inline pmd_t * pmd_offset(pud_t * dir, unsigned long address)
			
 
				 {
			
 
				-	pmd_t *ret = (pmd_t *) pud_page_vaddr(*dir) + ((address >> PMD_SHIFT) & (PTRS_PER_PAGE - 1));
			
 
				+	pmd_t *ret = pud_pgtable(*dir) + ((address >> PMD_SHIFT) & (PTRS_PER_PAGE - 1));
			
 
				 	smp_rmb(); /* see above */
			
 
				 	return ret;
			
 
				 }
			
--- a/arch/arc/include/asm/linkage.h
+++ b/arch/arc/include/asm/linkage.h
@@ -8,6 +8,10 @@
 
				 
			
 
				 #include <asm/dwarf.h>
			
 
				 
			
 
				+#define ASM_NL		 `	/* use '`' to mark new line in macro */
			
 
				+#define __ALIGN		.align 4
			
 
				+#define __ALIGN_STR	__stringify(__ALIGN)
			
 
				+
			
 
				 #ifdef __ASSEMBLY__
			
 
				 
			
 
				 .macro ST2 e, o, off
			
@@ -28,10 +32,6 @@
 
				 #endif
			
 
				 .endm
			
 
				 
			
 
				-#define ASM_NL		 `	/* use '`' to mark new line in macro */
			
 
				-#define __ALIGN		.align 4
			
 
				-#define __ALIGN_STR	__stringify(__ALIGN)
			
 
				-
			
 
				 /* annotation for data we want in DCCM - if enabled in .config */
			
 
				 .macro ARCFP_DATA nm
			
 
				 #ifdef CONFIG_ARC_HAS_DCCM
			
--- a/arch/arm/boot/dts/bcm53015-meraki-mr26.dts
+++ b/arch/arm/boot/dts/bcm53015-meraki-mr26.dts
@@ -128,7 +128,7 @@
 
				 
			
 
				 			fixed-link {
			
 
				 				speed = <1000>;
			
 
				-				duplex-full;
			
 
				+				full-duplex;
			
 
				 			};
			
 
				 		};
			
 
				 	};
			
--- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
+++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
@@ -212,7 +212,7 @@
 
				 
			
 
				 			fixed-link {
			
 
				 				speed = <1000>;
			
 
				-				duplex-full;
			
 
				+				full-duplex;
			
 
				 			};
			
 
				 		};
			
 
				 	};
			
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -532,7 +532,6 @@
 
				 				  "spi_lr_session_done",
			
 
				 				  "spi_lr_overread";
			
 
				 		clocks = <&iprocmed>;
			
 
				-		clock-names = "iprocmed";
			
 
				 		num-cs = <2>;
			
 
				 		#address-cells = <1>;
			
 
				 		#size-cells = <0>;
			
--- a/arch/arm/boot/dts/iwg20d-q7-common.dtsi
+++ b/arch/arm/boot/dts/iwg20d-q7-common.dtsi
@@ -49,7 +49,7 @@
 
				 	lcd_backlight: backlight {
			
 
				 		compatible = "pwm-backlight";
			
 
				 
			
 
				-		pwms = <&pwm3 0 5000000 0>;
			
 
				+		pwms = <&pwm3 0 5000000>;
			
 
				 		brightness-levels = <0 4 8 16 32 64 128 255>;
			
 
				 		default-brightness-level = <7>;
			
 
				 		enable-gpios = <&gpio5 14 GPIO_ACTIVE_HIGH>;
			
--- a/arch/arm/boot/dts/meson8.dtsi
+++ b/arch/arm/boot/dts/meson8.dtsi
@@ -611,13 +611,13 @@
 
				 
			
 
				 &uart_B {
			
 
				 	compatible = "amlogic,meson8-uart";
			
 
				-	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
			
 
				+	clocks = <&xtal>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>;
			
 
				 	clock-names = "xtal", "pclk", "baud";
			
 
				 };
			
 
				 
			
 
				 &uart_C {
			
 
				 	compatible = "amlogic,meson8-uart";
			
 
				-	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
			
 
				+	clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>;
			
 
				 	clock-names = "xtal", "pclk", "baud";
			
 
				 };
			
 
				 
			
--- a/arch/arm/boot/dts/meson8b.dtsi
+++ b/arch/arm/boot/dts/meson8b.dtsi
@@ -599,13 +599,13 @@
 
				 
			
 
				 &uart_B {
			
 
				 	compatible = "amlogic,meson8b-uart";
			
 
				-	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
			
 
				+	clocks = <&xtal>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>;
			
 
				 	clock-names = "xtal", "pclk", "baud";
			
 
				 };
			
 
				 
			
 
				 &uart_C {
			
 
				 	compatible = "amlogic,meson8b-uart";
			
 
				-	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
			
 
				+	clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>;
			
 
				 	clock-names = "xtal", "pclk", "baud";
			
 
				 };
			
 
				 
			
--- a/arch/arm/boot/dts/omap3-gta04a5one.dts
+++ b/arch/arm/boot/dts/omap3-gta04a5one.dts
@@ -5,9 +5,11 @@
 
				 
			
 
				 #include "omap3-gta04a5.dts"
			
 
				 
			
 
				-&omap3_pmx_core {
			
 
				+/ {
			
 
				 	model = "Goldelico GTA04A5/Letux 2804 with OneNAND";
			
 
				+};
			
 
				 
			
 
				+&omap3_pmx_core {
			
 
				 	gpmc_pins: pinmux_gpmc_pins {
			
 
				 		pinctrl-single,pins = <
			
 
				 
			
--- a/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi
@@ -120,10 +120,13 @@
 
				 
			
 
				 	sound {
			
 
				 		compatible = "audio-graph-card";
			
 
				-		routing =
			
 
				-			"MIC_IN", "Capture",
			
 
				-			"Capture", "Mic Bias",
			
 
				-			"Playback", "HP_OUT";
			
 
				+		widgets = "Headphone", "Headphone Jack",
			
 
				+			  "Line", "Line In Jack",
			
 
				+			  "Microphone", "Microphone Jack";
			
 
				+		routing = "Headphone Jack", "HP_OUT",
			
 
				+			  "LINE_IN", "Line In Jack",
			
 
				+			  "MIC_IN", "Microphone Jack",
			
 
				+			  "Microphone Jack", "Mic Bias";
			
 
				 		dais = <&sai2a_port &sai2b_port>;
			
 
				 		status = "okay";
			
 
				 	};
			
--- a/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi
@@ -88,7 +88,7 @@
 
				 
			
 
				 	sound {
			
 
				 		compatible = "audio-graph-card";
			
 
				-		label = "STM32MP1-AV96-HDMI";
			
 
				+		label = "STM32-AV96-HDMI";
			
 
				 		dais = <&sai2a_port>;
			
 
				 		status = "okay";
			
 
				 	};
			
@@ -232,6 +232,12 @@
 
				 			};
			
 
				 		};
			
 
				 	};
			
 
				+
			
 
				+	dh_mac_eeprom: eeprom@53 {
			
 
				+		compatible = "atmel,24c02";
			
 
				+		reg = <0x53>;
			
 
				+		pagesize = <16>;
			
 
				+	};
			
 
				 };
			
 
				 
			
 
				 &ltdc {
			
--- a/arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi
@@ -167,12 +167,6 @@
 
				 			status = "disabled";
			
 
				 		};
			
 
				 	};
			
 
				-
			
 
				-	eeprom@53 {
			
 
				-		compatible = "atmel,24c02";
			
 
				-		reg = <0x53>;
			
 
				-		pagesize = <16>;
			
 
				-	};
			
 
				 };
			
 
				 
			
 
				 &iwdg2 {
			
--- a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
@@ -406,7 +406,7 @@
 
				 	i2s2_port: port {
			
 
				 		i2s2_endpoint: endpoint {
			
 
				 			remote-endpoint = <&sii9022_tx_endpoint>;
			
 
				-			format = "i2s";
			
 
				+			dai-format = "i2s";
			
 
				 			mclk-fs = <256>;
			
 
				 		};
			
 
				 	};
			
--- a/arch/arm/include/asm/pgtable-3level.h
+++ b/arch/arm/include/asm/pgtable-3level.h
@@ -130,7 +130,7 @@
 
				 		flush_pmd_entry(pudp);	\
			
 
				 	} while (0)
			
 
				 
			
 
				-static inline pmd_t *pud_page_vaddr(pud_t pud)
			
 
				+static inline pmd_t *pud_pgtable(pud_t pud)
			
 
				 {
			
 
				 	return __va(pud_val(pud) & PHYS_MASK & (s32)PAGE_MASK);
			
 
				 }
			
--- a/arch/arm/mach-ep93xx/timer-ep93xx.c
+++ b/arch/arm/mach-ep93xx/timer-ep93xx.c
@@ -9,6 +9,7 @@
 
				 #include <linux/io.h>
			
 
				 #include <asm/mach/time.h>
			
 
				 #include "soc.h"
			
 
				+#include "platform.h"
			
 
				 
			
 
				 /*************************************************************************
			
 
				  * Timer handling for EP93xx
			
@@ -60,7 +61,7 @@ static u64 notrace ep93xx_read_sched_clock(void)
 
				 	return ret;
			
 
				 }
			
 
				 
			
 
				-u64 ep93xx_clocksource_read(struct clocksource *c)
			
 
				+static u64 ep93xx_clocksource_read(struct clocksource *c)
			
 
				 {
			
 
				 	u64 ret;
			
 
				 
			
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -13,6 +13,7 @@
 
				 #include <linux/of_platform.h>
			
 
				 #include <linux/irqdomain.h>
			
 
				 #include <linux/clocksource.h>
			
 
				+#include <linux/clockchips.h>
			
 
				 
			
 
				 #include <asm/setup.h>
			
 
				 #include <asm/mach/arch.h>
			
--- a/arch/arm/mach-orion5x/board-dt.c
+++ b/arch/arm/mach-orion5x/board-dt.c
@@ -63,6 +63,9 @@ static void __init orion5x_dt_init(void)
 
				 	if (of_machine_is_compatible("maxtor,shared-storage-2"))
			
 
				 		mss2_init();
			
 
				 
			
 
				+	if (of_machine_is_compatible("lacie,d2-network"))
			
 
				+		d2net_init();
			
 
				+
			
 
				 	of_platform_default_populate(NULL, orion5x_auxdata_lookup, NULL);
			
 
				 }
			
 
				 
			
--- a/arch/arm/mach-orion5x/common.h
+++ b/arch/arm/mach-orion5x/common.h
@@ -75,6 +75,12 @@ extern void mss2_init(void);
 
				 static inline void mss2_init(void) {}
			
 
				 #endif
			
 
				 
			
 
				+#ifdef CONFIG_MACH_D2NET_DT
			
 
				+void d2net_init(void);
			
 
				+#else
			
 
				+static inline void d2net_init(void) {}
			
 
				+#endif
			
 
				+
			
 
				 /*****************************************************************************
			
 
				  * Helpers to access Orion registers
			
 
				  ****************************************************************************/
			
--- a/arch/arm/probes/kprobes/checkers-common.c
+++ b/arch/arm/probes/kprobes/checkers-common.c
@@ -40,7 +40,7 @@ enum probes_insn checker_stack_use_imm_0xx(probes_opcode_t insn,
 
				  * Different from other insn uses imm8, the real addressing offset of
			
 
				  * STRD in T32 encoding should be imm8 * 4. See ARMARM description.
			
 
				  */
			
 
				-enum probes_insn checker_stack_use_t32strd(probes_opcode_t insn,
			
 
				+static enum probes_insn checker_stack_use_t32strd(probes_opcode_t insn,
			
 
				 		struct arch_probes_insn *asi,
			
 
				 		const struct decode_header *h)
			
 
				 {
			
--- a/arch/arm/probes/kprobes/core.c
+++ b/arch/arm/probes/kprobes/core.c
@@ -231,7 +231,7 @@ singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
 
				  * kprobe, and that level is reserved for user kprobe handlers, so we can't
			
 
				  * risk encountering a new kprobe in an interrupt handler.
			
 
				  */
			
 
				-void __kprobes kprobe_handler(struct pt_regs *regs)
			
 
				+static void __kprobes kprobe_handler(struct pt_regs *regs)
			
 
				 {
			
 
				 	struct kprobe *p, *cur;
			
 
				 	struct kprobe_ctlblk *kcb;
			
--- a/arch/arm/probes/kprobes/opt-arm.c
+++ b/arch/arm/probes/kprobes/opt-arm.c
@@ -145,8 +145,6 @@ __arch_remove_optimized_kprobe(struct optimized_kprobe *op, int dirty)
 
				 	}
			
 
				 }
			
 
				 
			
 
				-extern void kprobe_handler(struct pt_regs *regs);
			
 
				-
			
 
				 static void
			
 
				 optimized_callback(struct optimized_kprobe *op, struct pt_regs *regs)
			
 
				 {
			
--- a/arch/arm/probes/kprobes/test-core.c
+++ b/arch/arm/probes/kprobes/test-core.c
@@ -720,7 +720,7 @@ static const char coverage_register_lookup[16] = {
 
				 	[REG_TYPE_NOSPPCX]	= COVERAGE_ANY_REG | COVERAGE_SP,
			
 
				 };
			
 
				 
			
 
				-unsigned coverage_start_registers(const struct decode_header *h)
			
 
				+static unsigned coverage_start_registers(const struct decode_header *h)
			
 
				 {
			
 
				 	unsigned regs = 0;
			
 
				 	int i;
			
--- a/arch/arm/probes/kprobes/test-core.h
+++ b/arch/arm/probes/kprobes/test-core.h
@@ -454,3 +454,7 @@ void kprobe_thumb32_test_cases(void);
 
				 #else
			
 
				 void kprobe_arm_test_cases(void);
			
 
				 #endif
			
 
				+
			
 
				+void __kprobes_test_case_start(void);
			
 
				+void __kprobes_test_case_end_16(void);
			
 
				+void __kprobes_test_case_end_32(void);
			
--- a/arch/arm64/boot/dts/microchip/sparx5.dtsi
+++ b/arch/arm64/boot/dts/microchip/sparx5.dtsi
@@ -61,7 +61,7 @@
 
				 		interrupt-affinity = <&cpu0>, <&cpu1>;
			
 
				 	};
			
 
				 
			
 
				-	psci {
			
 
				+	psci: psci {
			
 
				 		compatible = "arm,psci-0.2";
			
 
				 		method = "smc";
			
 
				 	};
			
--- a/arch/arm64/boot/dts/microchip/sparx5_pcb_common.dtsi
+++ b/arch/arm64/boot/dts/microchip/sparx5_pcb_common.dtsi
@@ -6,6 +6,18 @@
 
				 /dts-v1/;
			
 
				 #include "sparx5.dtsi"
			
 
				 
			
 
				+&psci {
			
 
				+	status = "disabled";
			
 
				+};
			
 
				+
			
 
				+&cpu0 {
			
 
				+	enable-method = "spin-table";
			
 
				+};
			
 
				+
			
 
				+&cpu1 {
			
 
				+	enable-method = "spin-table";
			
 
				+};
			
 
				+
			
 
				 &uart0 {
			
 
				 	status = "okay";
			
 
				 };
			
--- a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
@@ -26,7 +26,7 @@
 
				 
			
 
				 	v1p05: v1p05-regulator {
			
 
				 		compatible = "regulator-fixed";
			
 
				-		reglator-name = "v1p05";
			
 
				+		regulator-name = "v1p05";
			
 
				 		regulator-always-on;
			
 
				 		regulator-boot-on;
			
 
				 
			
@@ -38,7 +38,7 @@
 
				 
			
 
				 	v12_poe: v12-poe-regulator {
			
 
				 		compatible = "regulator-fixed";
			
 
				-		reglator-name = "v12_poe";
			
 
				+		regulator-name = "v12_poe";
			
 
				 		regulator-always-on;
			
 
				 		regulator-boot-on;
			
 
				 
			
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1006,7 +1006,7 @@
 
				 			};
			
 
				 		};
			
 
				 
			
 
				-		camss: camss@1b00000 {
			
 
				+		camss: camss@1b0ac00 {
			
 
				 			compatible = "qcom,msm8916-camss";
			
 
				 			reg = <0x01b0ac00 0x200>,
			
 
				 				<0x01b00030 0x4>,
			
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
@@ -489,7 +489,7 @@
 
				 			reg = <0xfc4ab000 0x4>;
			
 
				 		};
			
 
				 
			
 
				-		spmi_bus: spmi@fc4c0000 {
			
 
				+		spmi_bus: spmi@fc4cf000 {
			
 
				 			compatible = "qcom,spmi-pmic-arb";
			
 
				 			reg = <0xfc4cf000 0x1000>,
			
 
				 			      <0xfc4cb000 0x1000>,
			
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -956,7 +956,7 @@
 
				 			};
			
 
				 		};
			
 
				 
			
 
				-		camss: camss@a00000 {
			
 
				+		camss: camss@a34000 {
			
 
				 			compatible = "qcom,msm8996-camss";
			
 
				 			reg = <0x00a34000 0x1000>,
			
 
				 			      <0x00a00030 0x4>,
			
--- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
@@ -270,7 +270,7 @@
 
				 	};
			
 
				 
			
 
				 	scif1_pins: scif1 {
			
 
				-		groups = "scif1_data_b", "scif1_ctrl";
			
 
				+		groups = "scif1_data_b";
			
 
				 		function = "scif1";
			
 
				 	};
			
 
				 
			
@@ -330,7 +330,6 @@
 
				 &scif1 {
			
 
				 	pinctrl-0 = <&scif1_pins>;
			
 
				 	pinctrl-names = "default";
			
 
				-	uart-has-rtscts;
			
 
				 
			
 
				 	status = "okay";
			
 
				 };
			
--- a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
@@ -19,25 +19,25 @@
 
				 &wkup_pmx2 {
			
 
				 	mcu_cpsw_pins_default: mcu-cpsw-pins-default {
			
 
				 		pinctrl-single,pins = <
			
 
				-			J721E_WKUP_IOPAD(0x0068, PIN_OUTPUT, 0) /* MCU_RGMII1_TX_CTL */
			
 
				-			J721E_WKUP_IOPAD(0x006c, PIN_INPUT, 0) /* MCU_RGMII1_RX_CTL */
			
 
				-			J721E_WKUP_IOPAD(0x0070, PIN_OUTPUT, 0) /* MCU_RGMII1_TD3 */
			
 
				-			J721E_WKUP_IOPAD(0x0074, PIN_OUTPUT, 0) /* MCU_RGMII1_TD2 */
			
 
				-			J721E_WKUP_IOPAD(0x0078, PIN_OUTPUT, 0) /* MCU_RGMII1_TD1 */
			
 
				-			J721E_WKUP_IOPAD(0x007c, PIN_OUTPUT, 0) /* MCU_RGMII1_TD0 */
			
 
				-			J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */
			
 
				-			J721E_WKUP_IOPAD(0x008c, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */
			
 
				-			J721E_WKUP_IOPAD(0x0090, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */
			
 
				-			J721E_WKUP_IOPAD(0x0094, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */
			
 
				-			J721E_WKUP_IOPAD(0x0080, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */
			
 
				-			J721E_WKUP_IOPAD(0x0084, PIN_INPUT, 0) /* MCU_RGMII1_RXC */
			
 
				+			J721E_WKUP_IOPAD(0x0000, PIN_OUTPUT, 0) /* MCU_RGMII1_TX_CTL */
			
 
				+			J721E_WKUP_IOPAD(0x0004, PIN_INPUT, 0) /* MCU_RGMII1_RX_CTL */
			
 
				+			J721E_WKUP_IOPAD(0x0008, PIN_OUTPUT, 0) /* MCU_RGMII1_TD3 */
			
 
				+			J721E_WKUP_IOPAD(0x000c, PIN_OUTPUT, 0) /* MCU_RGMII1_TD2 */
			
 
				+			J721E_WKUP_IOPAD(0x0010, PIN_OUTPUT, 0) /* MCU_RGMII1_TD1 */
			
 
				+			J721E_WKUP_IOPAD(0x0014, PIN_OUTPUT, 0) /* MCU_RGMII1_TD0 */
			
 
				+			J721E_WKUP_IOPAD(0x0020, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */
			
 
				+			J721E_WKUP_IOPAD(0x0024, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */
			
 
				+			J721E_WKUP_IOPAD(0x0028, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */
			
 
				+			J721E_WKUP_IOPAD(0x002c, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */
			
 
				+			J721E_WKUP_IOPAD(0x0018, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */
			
 
				+			J721E_WKUP_IOPAD(0x001c, PIN_INPUT, 0) /* MCU_RGMII1_RXC */
			
 
				 		>;
			
 
				 	};
			
 
				 
			
 
				 	mcu_mdio_pins_default: mcu-mdio1-pins-default {
			
 
				 		pinctrl-single,pins = <
			
 
				-			J721E_WKUP_IOPAD(0x009c, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */
			
 
				-			J721E_WKUP_IOPAD(0x0098, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */
			
 
				+			J721E_WKUP_IOPAD(0x0034, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */
			
 
				+			J721E_WKUP_IOPAD(0x0030, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */
			
 
				 		>;
			
 
				 	};
			
 
				 };
			
--- a/arch/arm64/include/asm/exception.h
+++ b/arch/arm64/include/asm/exception.h
@@ -8,16 +8,11 @@
 
				 #define __ASM_EXCEPTION_H
			
 
				 
			
 
				 #include <asm/esr.h>
			
 
				-#include <asm/kprobes.h>
			
 
				 #include <asm/ptrace.h>
			
 
				 
			
 
				 #include <linux/interrupt.h>
			
 
				 
			
 
				-#ifdef CONFIG_FUNCTION_GRAPH_TRACER
			
 
				 #define __exception_irq_entry	__irq_entry
			
 
				-#else
			
 
				-#define __exception_irq_entry	__kprobes
			
 
				-#endif
			
 
				 
			
 
				 static inline u32 disr_to_esr(u64 disr)
			
 
				 {
			
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -650,9 +650,9 @@ static inline phys_addr_t pud_page_paddr(pud_t pud)
 
				 	return __pud_to_phys(pud);
			
 
				 }
			
 
				 
			
 
				-static inline unsigned long pud_page_vaddr(pud_t pud)
			
 
				+static inline pmd_t *pud_pgtable(pud_t pud)
			
 
				 {
			
 
				-	return (unsigned long)__va(pud_page_paddr(pud));
			
 
				+	return (pmd_t *)__va(pud_page_paddr(pud));
			
 
				 }
			
 
				 
			
 
				 /* Find an entry in the second-level page table. */
			
@@ -711,9 +711,9 @@ static inline phys_addr_t p4d_page_paddr(p4d_t p4d)
 
				 	return __p4d_to_phys(p4d);
			
 
				 }
			
 
				 
			
 
				-static inline unsigned long p4d_page_vaddr(p4d_t p4d)
			
 
				+static inline pud_t *p4d_pgtable(p4d_t p4d)
			
 
				 {
			
 
				-	return (unsigned long)__va(p4d_page_paddr(p4d));
			
 
				+	return (pud_t *)__va(p4d_page_paddr(p4d));
			
 
				 }
			
 
				 
			
 
				 /* Find an entry in the frst-level page table. */
			
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -421,7 +421,7 @@ static phys_addr_t pgd_pgtable_alloc(int shift)
 
				 static void __init create_mapping_noalloc(phys_addr_t phys, unsigned long virt,
			
 
				 				  phys_addr_t size, pgprot_t prot)
			
 
				 {
			
 
				-	if ((virt >= PAGE_END) && (virt < VMALLOC_START)) {
			
 
				+	if (virt < PAGE_OFFSET) {
			
 
				 		pr_warn("BUG: not creating mapping for %pa at 0x%016lx - outside kernel range\n",
			
 
				 			&phys, virt);
			
 
				 		return;
			
@@ -448,7 +448,7 @@ void __init create_pgd_mapping(struct mm_struct *mm, phys_addr_t phys,
 
				 static void update_mapping_prot(phys_addr_t phys, unsigned long virt,
			
 
				 				phys_addr_t size, pgprot_t prot)
			
 
				 {
			
 
				-	if ((virt >= PAGE_END) && (virt < VMALLOC_START)) {
			
 
				+	if (virt < PAGE_OFFSET) {
			
 
				 		pr_warn("BUG: not updating mapping for %pa at 0x%016lx - outside kernel range\n",
			
 
				 			&phys, virt);
			
 
				 		return;
			
--- a/arch/ia64/include/asm/pgtable.h
+++ b/arch/ia64/include/asm/pgtable.h
@@ -279,7 +279,7 @@ extern unsigned long VMALLOC_END;
 
				 #define pud_bad(pud)			(!ia64_phys_addr_valid(pud_val(pud)))
			
 
				 #define pud_present(pud)		(pud_val(pud) != 0UL)
			
 
				 #define pud_clear(pudp)			(pud_val(*(pudp)) = 0UL)
			
 
				-#define pud_page_vaddr(pud)		((unsigned long) __va(pud_val(pud) & _PFN_MASK))
			
 
				+#define pud_pgtable(pud)		((pmd_t *) __va(pud_val(pud) & _PFN_MASK))
			
 
				 #define pud_page(pud)			virt_to_page((pud_val(pud) + PAGE_OFFSET))
			
 
				 
			
 
				 #if CONFIG_PGTABLE_LEVELS == 4
			
@@ -287,7 +287,7 @@ extern unsigned long VMALLOC_END;
 
				 #define p4d_bad(p4d)			(!ia64_phys_addr_valid(p4d_val(p4d)))
			
 
				 #define p4d_present(p4d)		(p4d_val(p4d) != 0UL)
			
 
				 #define p4d_clear(p4dp)			(p4d_val(*(p4dp)) = 0UL)
			
 
				-#define p4d_page_vaddr(p4d)		((unsigned long) __va(p4d_val(p4d) & _PFN_MASK))
			
 
				+#define p4d_pgtable(p4d)		((pud_t *) __va(p4d_val(p4d) & _PFN_MASK))
			
 
				 #define p4d_page(p4d)			virt_to_page((p4d_val(p4d) + PAGE_OFFSET))
			
 
				 #endif
			
 
				 
			
--- a/arch/m68k/include/asm/motorola_pgtable.h
+++ b/arch/m68k/include/asm/motorola_pgtable.h
@@ -129,7 +129,7 @@ static inline void pud_set(pud_t *pudp, pmd_t *pmdp)
 
				 
			
 
				 #define __pte_page(pte) ((unsigned long)__va(pte_val(pte) & PAGE_MASK))
			
 
				 #define pmd_page_vaddr(pmd) ((unsigned long)__va(pmd_val(pmd) & _TABLE_MASK))
			
 
				-#define pud_page_vaddr(pud) ((unsigned long)__va(pud_val(pud) & _TABLE_MASK))
			
 
				+#define pud_pgtable(pud) ((pmd_t *)__va(pud_val(pud) & _TABLE_MASK))
			
 
				 
			
 
				 
			
 
				 #define pte_none(pte)		(!pte_val(pte))
			
--- a/arch/mips/include/asm/pgtable-64.h
+++ b/arch/mips/include/asm/pgtable-64.h
@@ -210,9 +210,9 @@ static inline void p4d_clear(p4d_t *p4dp)
 
				 	p4d_val(*p4dp) = (unsigned long)invalid_pud_table;
			
 
				 }
			
 
				 
			
 
				-static inline unsigned long p4d_page_vaddr(p4d_t p4d)
			
 
				+static inline pud_t *p4d_pgtable(p4d_t p4d)
			
 
				 {
			
 
				-	return p4d_val(p4d);
			
 
				+	return (pud_t *)p4d_val(p4d);
			
 
				 }
			
 
				 
			
 
				 #define p4d_phys(p4d)		virt_to_phys((void *)p4d_val(p4d))
			
@@ -314,9 +314,9 @@ static inline void pud_clear(pud_t *pudp)
 
				 #endif
			
 
				 
			
 
				 #ifndef __PAGETABLE_PMD_FOLDED
			
 
				-static inline unsigned long pud_page_vaddr(pud_t pud)
			
 
				+static inline pmd_t *pud_pgtable(pud_t pud)
			
 
				 {
			
 
				-	return pud_val(pud);
			
 
				+	return (pmd_t *)pud_val(pud);
			
 
				 }
			
 
				 #define pud_phys(pud)		virt_to_phys((void *)pud_val(pud))
			
 
				 #define pud_page(pud)		(pfn_to_page(pud_phys(pud) >> PAGE_SHIFT))
			
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -1721,7 +1721,10 @@ static inline void decode_cpucfg(struct cpuinfo_mips *c)
 
				 
			
 
				 static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu)
			
 
				 {
			
 
				+	c->cputype = CPU_LOONGSON64;
			
 
				+
			
 
				 	/* All Loongson processors covered here define ExcCode 16 as GSExc. */
			
 
				+	decode_configs(c);
			
 
				 	c->options |= MIPS_CPU_GSEXCEX;
			
 
				 
			
 
				 	switch (c->processor_id & PRID_IMP_MASK) {
			
@@ -1731,7 +1734,6 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu)
 
				 		case PRID_REV_LOONGSON2K_R1_1:
			
 
				 		case PRID_REV_LOONGSON2K_R1_2:
			
 
				 		case PRID_REV_LOONGSON2K_R1_3:
			
 
				-			c->cputype = CPU_LOONGSON64;
			
 
				 			__cpu_name[cpu] = "Loongson-2K";
			
 
				 			set_elf_platform(cpu, "gs264e");
			
 
				 			set_isa(c, MIPS_CPU_ISA_M64R2);
			
@@ -1744,14 +1746,12 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu)
 
				 		switch (c->processor_id & PRID_REV_MASK) {
			
 
				 		case PRID_REV_LOONGSON3A_R2_0:
			
 
				 		case PRID_REV_LOONGSON3A_R2_1:
			
 
				-			c->cputype = CPU_LOONGSON64;
			
 
				 			__cpu_name[cpu] = "ICT Loongson-3";
			
 
				 			set_elf_platform(cpu, "loongson3a");
			
 
				 			set_isa(c, MIPS_CPU_ISA_M64R2);
			
 
				 			break;
			
 
				 		case PRID_REV_LOONGSON3A_R3_0:
			
 
				 		case PRID_REV_LOONGSON3A_R3_1:
			
 
				-			c->cputype = CPU_LOONGSON64;
			
 
				 			__cpu_name[cpu] = "ICT Loongson-3";
			
 
				 			set_elf_platform(cpu, "loongson3a");
			
 
				 			set_isa(c, MIPS_CPU_ISA_M64R2);
			
@@ -1771,7 +1771,6 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu)
 
				 		c->ases &= ~MIPS_ASE_VZ; /* VZ of Loongson-3A2000/3000 is incomplete */
			
 
				 		break;
			
 
				 	case PRID_IMP_LOONGSON_64G:
			
 
				-		c->cputype = CPU_LOONGSON64;
			
 
				 		__cpu_name[cpu] = "ICT Loongson-3";
			
 
				 		set_elf_platform(cpu, "loongson3a");
			
 
				 		set_isa(c, MIPS_CPU_ISA_M64R2);
			
@@ -1781,8 +1780,6 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu)
 
				 		panic("Unknown Loongson Processor ID!");
			
 
				 		break;
			
 
				 	}
			
 
				-
			
 
				-	decode_configs(c);
			
 
				 }
			
 
				 #else
			
 
				 static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu) { }
			
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -330,8 +330,8 @@ static inline void pmd_clear(pmd_t *pmd) {
 
				 
			
 
				 
			
 
				 #if CONFIG_PGTABLE_LEVELS == 3
			
 
				-#define pud_page_vaddr(pud) ((unsigned long) __va(pud_address(pud)))
			
 
				-#define pud_page(pud)	virt_to_page((void *)pud_page_vaddr(pud))
			
 
				+#define pud_pgtable(pud) ((pmd_t *) __va(pud_address(pud)))
			
 
				+#define pud_page(pud)	virt_to_page((void *)pud_pgtable(pud))
			
 
				 
			
 
				 /* For 64 bit we have three level tables */
			
 
				 
			
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -234,7 +234,7 @@ config PPC_EARLY_DEBUG_40x
 
				 
			
 
				 config PPC_EARLY_DEBUG_CPM
			
 
				 	bool "Early serial debugging for Freescale CPM-based serial ports"
			
 
				-	depends on SERIAL_CPM
			
 
				+	depends on SERIAL_CPM=y
			
 
				 	help
			
 
				 	  Select this to enable early debugging for Freescale chips
			
 
				 	  using a CPM-based serial port.  This assumes that the bootwrapper
			
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -429,3 +429,11 @@ checkbin:
 
				 		echo -n '*** Please use a different binutils version.' ; \
			
 
				 		false ; \
			
 
				 	fi
			
 
				+	@if test "x${CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT}" = "xy" -a \
			
 
				+		"x${CONFIG_LD_IS_BFD}" = "xy" -a \
			
 
				+		"${CONFIG_LD_VERSION}" = "23700" ; then \
			
 
				+		echo -n '*** binutils 2.37 drops unused section symbols, which recordmcount ' ; \
			
 
				+		echo 'is unable to handle.' ; \
			
 
				+		echo '*** Please use a different binutils version.' ; \
			
 
				+		false ; \
			
 
				+	fi
			
--- a/arch/powerpc/include/asm/book3s/64/pgtable.h
+++ b/arch/powerpc/include/asm/book3s/64/pgtable.h
@@ -1030,8 +1030,15 @@ extern struct page *p4d_page(p4d_t p4d);
 
				 /* Pointers in the page table tree are physical addresses */
			
 
				 #define __pgtable_ptr_val(ptr)	__pa(ptr)
			
 
				 
			
 
				-#define pud_page_vaddr(pud)	__va(pud_val(pud) & ~PUD_MASKED_BITS)
			
 
				-#define p4d_page_vaddr(p4d)	__va(p4d_val(p4d) & ~P4D_MASKED_BITS)
			
 
				+static inline pud_t *p4d_pgtable(p4d_t p4d)
			
 
				+{
			
 
				+	return (pud_t *)__va(p4d_val(p4d) & ~P4D_MASKED_BITS);
			
 
				+}
			
 
				+
			
 
				+static inline pmd_t *pud_pgtable(pud_t pud)
			
 
				+{
			
 
				+	return (pmd_t *)__va(pud_val(pud) & ~PUD_MASKED_BITS);
			
 
				+}
			
 
				 
			
 
				 #define pte_ERROR(e) \
			
 
				 	pr_err("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
			
--- a/arch/powerpc/include/asm/nohash/64/pgtable-4k.h
+++ b/arch/powerpc/include/asm/nohash/64/pgtable-4k.h
@@ -56,10 +56,14 @@
 
				 #define p4d_none(p4d)		(!p4d_val(p4d))
			
 
				 #define p4d_bad(p4d)		(p4d_val(p4d) == 0)
			
 
				 #define p4d_present(p4d)	(p4d_val(p4d) != 0)
			
 
				-#define p4d_page_vaddr(p4d)	(p4d_val(p4d) & ~P4D_MASKED_BITS)
			
 
				 
			
 
				 #ifndef __ASSEMBLY__
			
 
				 
			
 
				+static inline pud_t *p4d_pgtable(p4d_t p4d)
			
 
				+{
			
 
				+	return (pud_t *) (p4d_val(p4d) & ~P4D_MASKED_BITS);
			
 
				+}
			
 
				+
			
 
				 static inline void p4d_clear(p4d_t *p4dp)
			
 
				 {
			
 
				 	*p4dp = __p4d(0);
			
--- a/arch/powerpc/include/asm/nohash/64/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/64/pgtable.h
@@ -164,7 +164,11 @@ static inline void pud_clear(pud_t *pudp)
 
				 #define	pud_bad(pud)		(!is_kernel_addr(pud_val(pud)) \
			
 
				 				 || (pud_val(pud) & PUD_BAD_BITS))
			
 
				 #define pud_present(pud)	(pud_val(pud) != 0)
			
 
				-#define pud_page_vaddr(pud)	(pud_val(pud) & ~PUD_MASKED_BITS)
			
 
				+
			
 
				+static inline pmd_t *pud_pgtable(pud_t pud)
			
 
				+{
			
 
				+	return (pmd_t *)(pud_val(pud) & ~PUD_MASKED_BITS);
			
 
				+}
			
 
				 
			
 
				 extern struct page *pud_page(pud_t pud);
			
 
				 
			
--- a/arch/powerpc/mm/book3s64/radix_pgtable.c
+++ b/arch/powerpc/mm/book3s64/radix_pgtable.c
@@ -783,9 +783,9 @@ static void free_pud_table(pud_t *pud_start, p4d_t *p4d)
 
				 }
			
 
				 
			
 
				 static void remove_pte_table(pte_t *pte_start, unsigned long addr,
			
 
				-			     unsigned long end)
			
 
				+			     unsigned long end, bool direct)
			
 
				 {
			
 
				-	unsigned long next;
			
 
				+	unsigned long next, pages = 0;
			
 
				 	pte_t *pte;
			
 
				 
			
 
				 	pte = pte_start + pte_index(addr);
			
@@ -807,13 +807,16 @@ static void remove_pte_table(pte_t *pte_start, unsigned long addr,
 
				 		}
			
 
				 
			
 
				 		pte_clear(&init_mm, addr, pte);
			
 
				+		pages++;
			
 
				 	}
			
 
				+	if (direct)
			
 
				+		update_page_count(mmu_virtual_psize, -pages);
			
 
				 }
			
 
				 
			
 
				 static void __meminit remove_pmd_table(pmd_t *pmd_start, unsigned long addr,
			
 
				-			     unsigned long end)
			
 
				+				       unsigned long end, bool direct)
			
 
				 {
			
 
				-	unsigned long next;
			
 
				+	unsigned long next, pages = 0;
			
 
				 	pte_t *pte_base;
			
 
				 	pmd_t *pmd;
			
 
				 
			
@@ -831,19 +834,22 @@ static void __meminit remove_pmd_table(pmd_t *pmd_start, unsigned long addr,
 
				 				continue;
			
 
				 			}
			
 
				 			pte_clear(&init_mm, addr, (pte_t *)pmd);
			
 
				+			pages++;
			
 
				 			continue;
			
 
				 		}
			
 
				 
			
 
				 		pte_base = (pte_t *)pmd_page_vaddr(*pmd);
			
 
				-		remove_pte_table(pte_base, addr, next);
			
 
				+		remove_pte_table(pte_base, addr, next, direct);
			
 
				 		free_pte_table(pte_base, pmd);
			
 
				 	}
			
 
				+	if (direct)
			
 
				+		update_page_count(MMU_PAGE_2M, -pages);
			
 
				 }
			
 
				 
			
 
				 static void __meminit remove_pud_table(pud_t *pud_start, unsigned long addr,
			
 
				-			     unsigned long end)
			
 
				+				       unsigned long end, bool direct)
			
 
				 {
			
 
				-	unsigned long next;
			
 
				+	unsigned long next, pages = 0;
			
 
				 	pmd_t *pmd_base;
			
 
				 	pud_t *pud;
			
 
				 
			
@@ -861,16 +867,20 @@ static void __meminit remove_pud_table(pud_t *pud_start, unsigned long addr,
 
				 				continue;
			
 
				 			}
			
 
				 			pte_clear(&init_mm, addr, (pte_t *)pud);
			
 
				+			pages++;
			
 
				 			continue;
			
 
				 		}
			
 
				 
			
 
				-		pmd_base = (pmd_t *)pud_page_vaddr(*pud);
			
 
				-		remove_pmd_table(pmd_base, addr, next);
			
 
				+		pmd_base = pud_pgtable(*pud);
			
 
				+		remove_pmd_table(pmd_base, addr, next, direct);
			
 
				 		free_pmd_table(pmd_base, pud);
			
 
				 	}
			
 
				+	if (direct)
			
 
				+		update_page_count(MMU_PAGE_1G, -pages);
			
 
				 }
			
 
				 
			
 
				-static void __meminit remove_pagetable(unsigned long start, unsigned long end)
			
 
				+static void __meminit remove_pagetable(unsigned long start, unsigned long end,
			
 
				+				       bool direct)
			
 
				 {
			
 
				 	unsigned long addr, next;
			
 
				 	pud_t *pud_base;
			
@@ -898,8 +908,8 @@ static void __meminit remove_pagetable(unsigned long start, unsigned long end)
 
				 			continue;
			
 
				 		}
			
 
				 
			
 
				-		pud_base = (pud_t *)p4d_page_vaddr(*p4d);
			
 
				-		remove_pud_table(pud_base, addr, next);
			
 
				+		pud_base = p4d_pgtable(*p4d);
			
 
				+		remove_pud_table(pud_base, addr, next, direct);
			
 
				 		free_pud_table(pud_base, p4d);
			
 
				 	}
			
 
				 
			
@@ -922,7 +932,7 @@ int __meminit radix__create_section_mapping(unsigned long start,
 
				 
			
 
				 int __meminit radix__remove_section_mapping(unsigned long start, unsigned long end)
			
 
				 {
			
 
				-	remove_pagetable(start, end);
			
 
				+	remove_pagetable(start, end, true);
			
 
				 	return 0;
			
 
				 }
			
 
				 #endif /* CONFIG_MEMORY_HOTPLUG */
			
@@ -958,7 +968,7 @@ int __meminit radix__vmemmap_create_mapping(unsigned long start,
 
				 #ifdef CONFIG_MEMORY_HOTPLUG
			
 
				 void __meminit radix__vmemmap_remove_mapping(unsigned long start, unsigned long page_size)
			
 
				 {
			
 
				-	remove_pagetable(start, start + page_size);
			
 
				+	remove_pagetable(start, start + page_size, false);
			
 
				 }
			
 
				 #endif
			
 
				 #endif
			
@@ -1156,7 +1166,7 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr)
 
				 	pmd_t *pmd;
			
 
				 	int i;
			
 
				 
			
 
				-	pmd = (pmd_t *)pud_page_vaddr(*pud);
			
 
				+	pmd = pud_pgtable(*pud);
			
 
				 	pud_clear(pud);
			
 
				 
			
 
				 	flush_tlb_kernel_range(addr, addr + PUD_SIZE);
			
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -188,7 +188,7 @@ static bool altmap_cross_boundary(struct vmem_altmap *altmap, unsigned long star
 
				 	unsigned long nr_pfn = page_size / sizeof(struct page);
			
 
				 	unsigned long start_pfn = page_to_pfn((struct page *)start);
			
 
				 
			
 
				-	if ((start_pfn + nr_pfn) > altmap->end_pfn)
			
 
				+	if ((start_pfn + nr_pfn - 1) > altmap->end_pfn)
			
 
				 		return true;
			
 
				 
			
 
				 	if (start_pfn < altmap->base_pfn)
			
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -106,7 +106,7 @@ struct page *p4d_page(p4d_t p4d)
 
				 			VM_WARN_ON(!p4d_huge(p4d));
			
 
				 		return pte_page(p4d_pte(p4d));
			
 
				 	}
			
 
				-	return virt_to_page(p4d_page_vaddr(p4d));
			
 
				+	return virt_to_page(p4d_pgtable(p4d));
			
 
				 }
			
 
				 #endif
			
 
				 
			
@@ -117,7 +117,7 @@ struct page *pud_page(pud_t pud)
 
				 			VM_WARN_ON(!pud_huge(pud));
			
 
				 		return pte_page(pud_pte(pud));
			
 
				 	}
			
 
				-	return virt_to_page(pud_page_vaddr(pud));
			
 
				+	return virt_to_page(pud_pgtable(pud));
			
 
				 }
			
 
				 
			
 
				 /*
			
--- a/arch/powerpc/platforms/powernv/pci-sriov.c
+++ b/arch/powerpc/platforms/powernv/pci-sriov.c
@@ -600,12 +600,12 @@ static void pnv_pci_sriov_disable(struct pci_dev *pdev)
 
				 	struct pnv_iov_data   *iov;
			
 
				 
			
 
				 	iov = pnv_iov_get(pdev);
			
 
				-	num_vfs = iov->num_vfs;
			
 
				-	base_pe = iov->vf_pe_arr[0].pe_number;
			
 
				-
			
 
				 	if (WARN_ON(!iov))
			
 
				 		return;
			
 
				 
			
 
				+	num_vfs = iov->num_vfs;
			
 
				+	base_pe = iov->vf_pe_arr[0].pe_number;
			
 
				+
			
 
				 	/* Release VF PEs */
			
 
				 	pnv_ioda_release_vf_PE(pdev);
			
 
				 
			
--- a/arch/riscv/include/asm/pgtable-64.h
+++ b/arch/riscv/include/asm/pgtable-64.h
@@ -60,9 +60,9 @@ static inline void pud_clear(pud_t *pudp)
 
				 	set_pud(pudp, __pud(0));
			
 
				 }
			
 
				 
			
 
				-static inline unsigned long pud_page_vaddr(pud_t pud)
			
 
				+static inline pmd_t *pud_pgtable(pud_t pud)
			
 
				 {
			
 
				-	return (unsigned long)pfn_to_virt(pud_val(pud) >> _PAGE_PFN_SHIFT);
			
 
				+	return (pmd_t *)pfn_to_virt(pud_val(pud) >> _PAGE_PFN_SHIFT);
			
 
				 }
			
 
				 
			
 
				 static inline struct page *pud_page(pud_t pud)
			
--- a/arch/riscv/net/bpf_jit.h
+++ b/arch/riscv/net/bpf_jit.h
@@ -69,6 +69,7 @@ struct rv_jit_context {
 
				 	struct bpf_prog *prog;
			
 
				 	u16 *insns;		/* RV insns */
			
 
				 	int ninsns;
			
 
				+	int prologue_len;
			
 
				 	int epilogue_offset;
			
 
				 	int *offset;		/* BPF to RV */
			
 
				 	unsigned long flags;
			
@@ -214,8 +215,8 @@ static inline int rv_offset(int insn, int off, struct rv_jit_context *ctx)
 
				 	int from, to;
			
 
				 
			
 
				 	off++; /* BPF branch is from PC+1, RV is from PC */
			
 
				-	from = (insn > 0) ? ctx->offset[insn - 1] : 0;
			
 
				-	to = (insn + off > 0) ? ctx->offset[insn + off - 1] : 0;
			
 
				+	from = (insn > 0) ? ctx->offset[insn - 1] : ctx->prologue_len;
			
 
				+	to = (insn + off > 0) ? ctx->offset[insn + off - 1] : ctx->prologue_len;
			
 
				 	return ninsns_rvoff(to - from);
			
 
				 }
			
 
				 
			
--- a/arch/riscv/net/bpf_jit_comp64.c
+++ b/arch/riscv/net/bpf_jit_comp64.c
@@ -1144,16 +1144,3 @@ void bpf_jit_build_epilogue(struct rv_jit_context *ctx)
 
				 {
			
 
				 	__build_epilogue(false, ctx);
			
 
				 }
			
 
				-
			
 
				-void *bpf_jit_alloc_exec(unsigned long size)
			
 
				-{
			
 
				-	return __vmalloc_node_range(size, PAGE_SIZE, BPF_JIT_REGION_START,
			
 
				-				    BPF_JIT_REGION_END, GFP_KERNEL,
			
 
				-				    PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
			
 
				-				    __builtin_return_address(0));
			
 
				-}
			
 
				-
			
 
				-void bpf_jit_free_exec(void *addr)
			
 
				-{
			
 
				-	return vfree(addr);
			
 
				-}
			
--- a/arch/riscv/net/bpf_jit_core.c
+++ b/arch/riscv/net/bpf_jit_core.c
@@ -83,6 +83,12 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
 
				 		prog = orig_prog;
			
 
				 		goto out_offset;
			
 
				 	}
			
 
				+
			
 
				+	if (build_body(ctx, extra_pass, NULL)) {
			
 
				+		prog = orig_prog;
			
 
				+		goto out_offset;
			
 
				+	}
			
 
				+
			
 
				 	for (i = 0; i < prog->len; i++) {
			
 
				 		prev_ninsns += 32;
			
 
				 		ctx->offset[i] = prev_ninsns;
			
@@ -91,11 +97,15 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
 
				 	for (i = 0; i < NR_JIT_ITERATIONS; i++) {
			
 
				 		pass++;
			
 
				 		ctx->ninsns = 0;
			
 
				+
			
 
				+		bpf_jit_build_prologue(ctx);
			
 
				+		ctx->prologue_len = ctx->ninsns;
			
 
				+
			
 
				 		if (build_body(ctx, extra_pass, ctx->offset)) {
			
 
				 			prog = orig_prog;
			
 
				 			goto out_offset;
			
 
				 		}
			
 
				-		bpf_jit_build_prologue(ctx);
			
 
				+
			
 
				 		ctx->epilogue_offset = ctx->ninsns;
			
 
				 		bpf_jit_build_epilogue(ctx);
			
 
				 
			
@@ -153,6 +163,10 @@ skip_init_ctx:
 
				 	bpf_flush_icache(jit_data->header, ctx->insns + ctx->ninsns);
			
 
				 
			
 
				 	if (!prog->is_func || extra_pass) {
			
 
				+		bpf_jit_binary_lock_ro(jit_data->header);
			
 
				+		for (i = 0; i < prog->len; i++)
			
 
				+			ctx->offset[i] = ninsns_rvoff(ctx->offset[i]);
			
 
				+		bpf_prog_fill_jited_linfo(prog, ctx->offset);
			
 
				 out_offset:
			
 
				 		kfree(ctx->offset);
			
 
				 		kfree(jit_data);
			
@@ -165,3 +179,16 @@ out:
 
				 					   tmp : orig_prog);
			
 
				 	return prog;
			
 
				 }
			
 
				+
			
 
				+void *bpf_jit_alloc_exec(unsigned long size)
			
 
				+{
			
 
				+	return __vmalloc_node_range(size, PAGE_SIZE, BPF_JIT_REGION_START,
			
 
				+				    BPF_JIT_REGION_END, GFP_KERNEL,
			
 
				+				    PAGE_KERNEL, 0, NUMA_NO_NODE,
			
 
				+				    __builtin_return_address(0));
			
 
				+}
			
 
				+
			
 
				+void bpf_jit_free_exec(void *addr)
			
 
				+{
			
 
				+	return vfree(addr);
			
 
				+}
			
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -29,6 +29,7 @@ KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float
 
				 KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables
			
 
				 KBUILD_CFLAGS_DECOMPRESSOR += -ffreestanding
			
 
				 KBUILD_CFLAGS_DECOMPRESSOR += -fno-stack-protector
			
 
				+KBUILD_CFLAGS_DECOMPRESSOR += -fPIE
			
 
				 KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, address-of-packed-member)
			
 
				 KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g)
			
 
				 KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))
			
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -2005,6 +2005,10 @@ static unsigned long kvm_s390_next_dirty_cmma(struct kvm_memslots *slots,
 
				 		ms = slots->memslots + slotidx;
			
 
				 		ofs = 0;
			
 
				 	}
			
 
				+
			
 
				+	if (cur_gfn < ms->base_gfn)
			
 
				+		ofs = 0;
			
 
				+
			
 
				 	ofs = find_next_bit(kvm_second_dirty_bitmap(ms), ms->npages, ofs);
			
 
				 	while ((slotidx > 0) && (ofs >= ms->npages)) {
			
 
				 		slotidx--;
			
--- a/arch/s390/kvm/vsie.c
+++ b/arch/s390/kvm/vsie.c
@@ -168,7 +168,8 @@ static int setup_apcb00(struct kvm_vcpu *vcpu, unsigned long *apcb_s,
 
				 			    sizeof(struct kvm_s390_apcb0)))
			
 
				 		return -EFAULT;
			
 
				 
			
 
				-	bitmap_and(apcb_s, apcb_s, apcb_h, sizeof(struct kvm_s390_apcb0));
			
 
				+	bitmap_and(apcb_s, apcb_s, apcb_h,
			
 
				+		   BITS_PER_BYTE * sizeof(struct kvm_s390_apcb0));
			
 
				 
			
 
				 	return 0;
			
 
				 }
			
@@ -190,7 +191,8 @@ static int setup_apcb11(struct kvm_vcpu *vcpu, unsigned long *apcb_s,
 
				 			    sizeof(struct kvm_s390_apcb1)))
			
 
				 		return -EFAULT;
			
 
				 
			
 
				-	bitmap_and(apcb_s, apcb_s, apcb_h, sizeof(struct kvm_s390_apcb1));
			
 
				+	bitmap_and(apcb_s, apcb_s, apcb_h,
			
 
				+		   BITS_PER_BYTE * sizeof(struct kvm_s390_apcb1));
			
 
				 
			
 
				 	return 0;
			
 
				 }
			
--- a/arch/sh/drivers/dma/dma-sh.c
+++ b/arch/sh/drivers/dma/dma-sh.c
@@ -18,6 +18,18 @@
 
				 #include <cpu/dma-register.h>
			
 
				 #include <cpu/dma.h>
			
 
				 
			
 
				+/*
			
 
				+ * Some of the SoCs feature two DMAC modules. In such a case, the channels are
			
 
				+ * distributed equally among them.
			
 
				+ */
			
 
				+#ifdef	SH_DMAC_BASE1
			
 
				+#define	SH_DMAC_NR_MD_CH	(CONFIG_NR_ONCHIP_DMA_CHANNELS / 2)
			
 
				+#else
			
 
				+#define	SH_DMAC_NR_MD_CH	CONFIG_NR_ONCHIP_DMA_CHANNELS
			
 
				+#endif
			
 
				+
			
 
				+#define	SH_DMAC_CH_SZ		0x10
			
 
				+
			
 
				 /*
			
 
				  * Define the default configuration for dual address memory-memory transfer.
			
 
				  * The 0x400 value represents auto-request, external->external.
			
@@ -29,7 +41,7 @@ static unsigned long dma_find_base(unsigned int chan)
 
				 	unsigned long base = SH_DMAC_BASE0;
			
 
				 
			
 
				 #ifdef SH_DMAC_BASE1
			
 
				-	if (chan >= 6)
			
 
				+	if (chan >= SH_DMAC_NR_MD_CH)
			
 
				 		base = SH_DMAC_BASE1;
			
 
				 #endif
			
 
				 
			
@@ -40,13 +52,13 @@ static unsigned long dma_base_addr(unsigned int chan)
 
				 {
			
 
				 	unsigned long base = dma_find_base(chan);
			
 
				 
			
 
				-	/* Normalize offset calculation */
			
 
				-	if (chan >= 9)
			
 
				-		chan -= 6;
			
 
				-	if (chan >= 4)
			
 
				-		base += 0x10;
			
 
				+	chan = (chan % SH_DMAC_NR_MD_CH) * SH_DMAC_CH_SZ;
			
 
				+
			
 
				+	/* DMAOR is placed inside the channel register space. Step over it. */
			
 
				+	if (chan >= DMAOR)
			
 
				+		base += SH_DMAC_CH_SZ;
			
 
				 
			
 
				-	return base + (chan * 0x10);
			
 
				+	return base + chan;
			
 
				 }
			
 
				 
			
 
				 #ifdef CONFIG_SH_DMA_IRQ_MULTI
			
@@ -250,12 +262,11 @@ static int sh_dmac_get_dma_residue(struct dma_channel *chan)
 
				 #define NR_DMAOR	1
			
 
				 #endif
			
 
				 
			
 
				-/*
			
 
				- * DMAOR bases are broken out amongst channel groups. DMAOR0 manages
			
 
				- * channels 0 - 5, DMAOR1 6 - 11 (optional).
			
 
				- */
			
 
				-#define dmaor_read_reg(n)		__raw_readw(dma_find_base((n)*6))
			
 
				-#define dmaor_write_reg(n, data)	__raw_writew(data, dma_find_base(n)*6)
			
 
				+#define dmaor_read_reg(n)		__raw_readw(dma_find_base((n) * \
			
 
				+						    SH_DMAC_NR_MD_CH) + DMAOR)
			
 
				+#define dmaor_write_reg(n, data)	__raw_writew(data, \
			
 
				+						     dma_find_base((n) * \
			
 
				+						     SH_DMAC_NR_MD_CH) + DMAOR)
			
 
				 
			
 
				 static inline int dmaor_reset(int no)
			
 
				 {
			
--- a/arch/sh/include/asm/pgtable-3level.h
+++ b/arch/sh/include/asm/pgtable-3level.h
@@ -32,9 +32,9 @@ typedef struct { unsigned long long pmd; } pmd_t;
 
				 #define pmd_val(x)	((x).pmd)
			
 
				 #define __pmd(x)	((pmd_t) { (x) } )
			
 
				 
			
 
				-static inline unsigned long pud_page_vaddr(pud_t pud)
			
 
				+static inline pmd_t *pud_pgtable(pud_t pud)
			
 
				 {
			
 
				-	return pud_val(pud);
			
 
				+	return (pmd_t *)(unsigned long)pud_val(pud);
			
 
				 }
			
 
				 
			
 
				 /* only used by the stubbed out hugetlb gup code, should never be called */
			
--- a/arch/sh/kernel/cpu/sh2/probe.c
+++ b/arch/sh/kernel/cpu/sh2/probe.c
@@ -21,7 +21,7 @@ static int __init scan_cache(unsigned long node, const char *uname,
 
				 	if (!of_flat_dt_is_compatible(node, "jcore,cache"))
			
 
				 		return 0;
			
 
				 
			
 
				-	j2_ccr_base = (u32 __iomem *)of_flat_dt_translate_address(node);
			
 
				+	j2_ccr_base = ioremap(of_flat_dt_translate_address(node), 4);
			
 
				 
			
 
				 	return 1;
			
 
				 }
			
--- a/arch/sparc/include/asm/pgtable_32.h
+++ b/arch/sparc/include/asm/pgtable_32.h
@@ -152,13 +152,13 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)
 
				 	return (unsigned long)__nocache_va(v << 4);
			
 
				 }
			
 
				 
			
 
				-static inline unsigned long pud_page_vaddr(pud_t pud)
			
 
				+static inline pmd_t *pud_pgtable(pud_t pud)
			
 
				 {
			
 
				 	if (srmmu_device_memory(pud_val(pud))) {
			
 
				-		return ~0;
			
 
				+		return (pmd_t *)~0;
			
 
				 	} else {
			
 
				 		unsigned long v = pud_val(pud) & SRMMU_PTD_PMASK;
			
 
				-		return (unsigned long)__nocache_va(v << 4);
			
 
				+		return (pmd_t *)__nocache_va(v << 4);
			
 
				 	}
			
 
				 }
			
 
				 
			
--- a/arch/sparc/include/asm/pgtable_64.h
+++ b/arch/sparc/include/asm/pgtable_64.h
@@ -845,23 +845,23 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)
 
				 	return ((unsigned long) __va(pfn << PAGE_SHIFT));
			
 
				 }
			
 
				 
			
 
				-static inline unsigned long pud_page_vaddr(pud_t pud)
			
 
				+static inline pmd_t *pud_pgtable(pud_t pud)
			
 
				 {
			
 
				 	pte_t pte = __pte(pud_val(pud));
			
 
				 	unsigned long pfn;
			
 
				 
			
 
				 	pfn = pte_pfn(pte);
			
 
				 
			
 
				-	return ((unsigned long) __va(pfn << PAGE_SHIFT));
			
 
				+	return ((pmd_t *) __va(pfn << PAGE_SHIFT));
			
 
				 }
			
 
				 
			
 
				 #define pmd_page(pmd) 			virt_to_page((void *)pmd_page_vaddr(pmd))
			
 
				-#define pud_page(pud) 			virt_to_page((void *)pud_page_vaddr(pud))
			
 
				+#define pud_page(pud)			virt_to_page((void *)pud_pgtable(pud))
			
 
				 #define pmd_clear(pmdp)			(pmd_val(*(pmdp)) = 0UL)
			
 
				 #define pud_present(pud)		(pud_val(pud) != 0U)
			
 
				 #define pud_clear(pudp)			(pud_val(*(pudp)) = 0UL)
			
 
				-#define p4d_page_vaddr(p4d)		\
			
 
				-	((unsigned long) __va(p4d_val(p4d)))
			
 
				+#define p4d_pgtable(p4d)		\
			
 
				+	((pud_t *) __va(p4d_val(p4d)))
			
 
				 #define p4d_present(p4d)		(p4d_val(p4d) != 0U)
			
 
				 #define p4d_clear(p4dp)			(p4d_val(*(p4dp)) = 0UL)
			
 
				 
			
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -147,7 +147,7 @@ export LDFLAGS_vmlinux := $(LDFLAGS_EXECSTACK)
 
				 # When cleaning we don't include .config, so we don't include
			
 
				 # TT or skas makefiles and don't clean skas_ptregs.h.
			
 
				 CLEAN_FILES += linux x.i gmon.out
			
 
				-MRPROPER_FILES += arch/$(SUBARCH)/include/generated
			
 
				+MRPROPER_FILES += $(HOST_DIR)/include/generated
			
 
				 
			
 
				 archclean:
			
 
				 	@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
			
--- a/arch/um/include/asm/pgtable-3level.h
+++ b/arch/um/include/asm/pgtable-3level.h
@@ -84,7 +84,7 @@ static inline void pud_clear (pud_t *pud)
 
				 }
			
 
				 
			
 
				 #define pud_page(pud) phys_to_page(pud_val(pud) & PAGE_MASK)
			
 
				-#define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PAGE_MASK))
			
 
				+#define pud_pgtable(pud) ((pmd_t *) __va(pud_val(pud) & PAGE_MASK))
			
 
				 
			
 
				 static inline unsigned long pte_pfn(pte_t pte)
			
 
				 {
			
--- a/arch/x86/events/amd/core.c
+++ b/arch/x86/events/amd/core.c
@@ -364,7 +364,7 @@ static int amd_pmu_hw_config(struct perf_event *event)
 
				 
			
 
				 	/* pass precise event sampling to ibs: */
			
 
				 	if (event->attr.precise_ip && get_ibs_caps())
			
 
				-		return -ENOENT;
			
 
				+		return forward_event_to_ibs(event);
			
 
				 
			
 
				 	if (has_branch_stack(event))
			
 
				 		return -EOPNOTSUPP;
			
--- a/arch/x86/events/amd/ibs.c
+++ b/arch/x86/events/amd/ibs.c
@@ -202,7 +202,7 @@ static struct perf_ibs *get_ibs_pmu(int type)
 
				 }
			
 
				 
			
 
				 /*
			
 
				- * Use IBS for precise event sampling:
			
 
				+ * core pmu config -> IBS config
			
 
				  *
			
 
				  *  perf record -a -e cpu-cycles:p ...    # use ibs op counting cycle count
			
 
				  *  perf record -a -e r076:p ...          # same as -e cpu-cycles:p
			
@@ -211,25 +211,9 @@ static struct perf_ibs *get_ibs_pmu(int type)
 
				  * IbsOpCntCtl (bit 19) of IBS Execution Control Register (IbsOpCtl,
			
 
				  * MSRC001_1033) is used to select either cycle or micro-ops counting
			
 
				  * mode.
			
 
				- *
			
 
				- * The rip of IBS samples has skid 0. Thus, IBS supports precise
			
 
				- * levels 1 and 2 and the PERF_EFLAGS_EXACT is set. In rare cases the
			
 
				- * rip is invalid when IBS was not able to record the rip correctly.
			
 
				- * We clear PERF_EFLAGS_EXACT and take the rip from pt_regs then.
			
 
				- *
			
 
				  */
			
 
				-static int perf_ibs_precise_event(struct perf_event *event, u64 *config)
			
 
				+static int core_pmu_ibs_config(struct perf_event *event, u64 *config)
			
 
				 {
			
 
				-	switch (event->attr.precise_ip) {
			
 
				-	case 0:
			
 
				-		return -ENOENT;
			
 
				-	case 1:
			
 
				-	case 2:
			
 
				-		break;
			
 
				-	default:
			
 
				-		return -EOPNOTSUPP;
			
 
				-	}
			
 
				-
			
 
				 	switch (event->attr.type) {
			
 
				 	case PERF_TYPE_HARDWARE:
			
 
				 		switch (event->attr.config) {
			
@@ -255,22 +239,37 @@ static int perf_ibs_precise_event(struct perf_event *event, u64 *config)
 
				 	return -EOPNOTSUPP;
			
 
				 }
			
 
				 
			
 
				+/*
			
 
				+ * The rip of IBS samples has skid 0. Thus, IBS supports precise
			
 
				+ * levels 1 and 2 and the PERF_EFLAGS_EXACT is set. In rare cases the
			
 
				+ * rip is invalid when IBS was not able to record the rip correctly.
			
 
				+ * We clear PERF_EFLAGS_EXACT and take the rip from pt_regs then.
			
 
				+ */
			
 
				+int forward_event_to_ibs(struct perf_event *event)
			
 
				+{
			
 
				+	u64 config = 0;
			
 
				+
			
 
				+	if (!event->attr.precise_ip || event->attr.precise_ip > 2)
			
 
				+		return -EOPNOTSUPP;
			
 
				+
			
 
				+	if (!core_pmu_ibs_config(event, &config)) {
			
 
				+		event->attr.type = perf_ibs_op.pmu.type;
			
 
				+		event->attr.config = config;
			
 
				+	}
			
 
				+	return -ENOENT;
			
 
				+}
			
 
				+
			
 
				 static int perf_ibs_init(struct perf_event *event)
			
 
				 {
			
 
				 	struct hw_perf_event *hwc = &event->hw;
			
 
				 	struct perf_ibs *perf_ibs;
			
 
				 	u64 max_cnt, config;
			
 
				-	int ret;
			
 
				 
			
 
				 	perf_ibs = get_ibs_pmu(event->attr.type);
			
 
				-	if (perf_ibs) {
			
 
				-		config = event->attr.config;
			
 
				-	} else {
			
 
				-		perf_ibs = &perf_ibs_op;
			
 
				-		ret = perf_ibs_precise_event(event, &config);
			
 
				-		if (ret)
			
 
				-			return ret;
			
 
				-	}
			
 
				+	if (!perf_ibs)
			
 
				+		return -ENOENT;
			
 
				+
			
 
				+	config = event->attr.config;
			
 
				 
			
 
				 	if (event->pmu != &perf_ibs->pmu)
			
 
				 		return -ENOENT;
			
--- a/arch/x86/include/asm/perf_event.h
+++ b/arch/x86/include/asm/perf_event.h
@@ -412,8 +412,10 @@ struct pebs_xmm {
 
				 
			
 
				 #ifdef CONFIG_X86_LOCAL_APIC
			
 
				 extern u32 get_ibs_caps(void);
			
 
				+extern int forward_event_to_ibs(struct perf_event *event);
			
 
				 #else
			
 
				 static inline u32 get_ibs_caps(void) { return 0; }
			
 
				+static inline int forward_event_to_ibs(struct perf_event *event) { return -ENOENT; }
			
 
				 #endif
			
 
				 
			
 
				 #ifdef CONFIG_PERF_EVENTS
			
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -865,9 +865,9 @@ static inline int pud_present(pud_t pud)
 
				 	return pud_flags(pud) & _PAGE_PRESENT;
			
 
				 }
			
 
				 
			
 
				-static inline unsigned long pud_page_vaddr(pud_t pud)
			
 
				+static inline pmd_t *pud_pgtable(pud_t pud)
			
 
				 {
			
 
				-	return (unsigned long)__va(pud_val(pud) & pud_pfn_mask(pud));
			
 
				+	return (pmd_t *)__va(pud_val(pud) & pud_pfn_mask(pud));
			
 
				 }
			
 
				 
			
 
				 /*
			
@@ -906,9 +906,9 @@ static inline int p4d_present(p4d_t p4d)
 
				 	return p4d_flags(p4d) & _PAGE_PRESENT;
			
 
				 }
			
 
				 
			
 
				-static inline unsigned long p4d_page_vaddr(p4d_t p4d)
			
 
				+static inline pud_t *p4d_pgtable(p4d_t p4d)
			
 
				 {
			
 
				-	return (unsigned long)__va(p4d_val(p4d) & p4d_pfn_mask(p4d));
			
 
				+	return (pud_t *)__va(p4d_val(p4d) & p4d_pfn_mask(p4d));
			
 
				 }
			
 
				 
			
 
				 /*
			
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -235,8 +235,8 @@ static inline void native_pgd_clear(pgd_t *pgd)
 
				 
			
 
				 #define __pte_to_swp_entry(pte)		((swp_entry_t) { pte_val((pte)) })
			
 
				 #define __pmd_to_swp_entry(pmd)		((swp_entry_t) { pmd_val((pmd)) })
			
 
				-#define __swp_entry_to_pte(x)		((pte_t) { .pte = (x).val })
			
 
				-#define __swp_entry_to_pmd(x)		((pmd_t) { .pmd = (x).val })
			
 
				+#define __swp_entry_to_pte(x)		(__pte((x).val))
			
 
				+#define __swp_entry_to_pmd(x)		(__pmd((x).val))
			
 
				 
			
 
				 extern int kern_addr_valid(unsigned long addr);
			
 
				 extern void cleanup_highmap(void);
			
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -715,11 +715,15 @@ unlock:
 
				 static void show_rdt_tasks(struct rdtgroup *r, struct seq_file *s)
			
 
				 {
			
 
				 	struct task_struct *p, *t;
			
 
				+	pid_t pid;
			
 
				 
			
 
				 	rcu_read_lock();
			
 
				 	for_each_process_thread(p, t) {
			
 
				-		if (is_closid_match(t, r) || is_rmid_match(t, r))
			
 
				-			seq_printf(s, "%d\n", t->pid);
			
 
				+		if (is_closid_match(t, r) || is_rmid_match(t, r)) {
			
 
				+			pid = task_pid_vnr(t);
			
 
				+			if (pid)
			
 
				+				seq_printf(s, "%d\n", pid);
			
 
				+		}
			
 
				 	}
			
 
				 	rcu_read_unlock();
			
 
				 }
			
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -100,6 +100,17 @@ DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
 
				 DEFINE_PER_CPU_READ_MOSTLY(struct cpuinfo_x86, cpu_info);
			
 
				 EXPORT_PER_CPU_SYMBOL(cpu_info);
			
 
				 
			
 
				+struct mwait_cpu_dead {
			
 
				+	unsigned int	control;
			
 
				+	unsigned int	status;
			
 
				+};
			
 
				+
			
 
				+/*
			
 
				+ * Cache line aligned data for mwait_play_dead(). Separate on purpose so
			
 
				+ * that it's unlikely to be touched by other CPUs.
			
 
				+ */
			
 
				+static DEFINE_PER_CPU_ALIGNED(struct mwait_cpu_dead, mwait_cpu_dead);
			
 
				+
			
 
				 /* Logical package management. We might want to allocate that dynamically */
			
 
				 unsigned int __max_logical_packages __read_mostly;
			
 
				 EXPORT_SYMBOL(__max_logical_packages);
			
@@ -1674,10 +1685,10 @@ EXPORT_SYMBOL_GPL(cond_wakeup_cpu0);
 
				  */
			
 
				 static inline void mwait_play_dead(void)
			
 
				 {
			
 
				+	struct mwait_cpu_dead *md = this_cpu_ptr(&mwait_cpu_dead);
			
 
				 	unsigned int eax, ebx, ecx, edx;
			
 
				 	unsigned int highest_cstate = 0;
			
 
				 	unsigned int highest_subcstate = 0;
			
 
				-	void *mwait_ptr;
			
 
				 	int i;
			
 
				 
			
 
				 	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD ||
			
@@ -1712,13 +1723,6 @@ static inline void mwait_play_dead(void)
 
				 			(highest_subcstate - 1);
			
 
				 	}
			
 
				 
			
 
				-	/*
			
 
				-	 * This should be a memory location in a cache line which is
			
 
				-	 * unlikely to be touched by other processors.  The actual
			
 
				-	 * content is immaterial as it is not actually modified in any way.
			
 
				-	 */
			
 
				-	mwait_ptr = &current_thread_info()->flags;
			
 
				-
			
 
				 	wbinvd();
			
 
				 
			
 
				 	while (1) {
			
@@ -1730,9 +1734,9 @@ static inline void mwait_play_dead(void)
 
				 		 * case where we return around the loop.
			
 
				 		 */
			
 
				 		mb();
			
 
				-		clflush(mwait_ptr);
			
 
				+		clflush(md);
			
 
				 		mb();
			
 
				-		__monitor(mwait_ptr, 0, 0);
			
 
				+		__monitor(md, 0, 0);
			
 
				 		mb();
			
 
				 		__mwait(eax, 0);
			
 
				 
			
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -193,8 +193,8 @@ static void sync_global_pgds_l4(unsigned long start, unsigned long end)
 
				 			spin_lock(pgt_lock);
			
 
				 
			
 
				 			if (!p4d_none(*p4d_ref) && !p4d_none(*p4d))
			
 
				-				BUG_ON(p4d_page_vaddr(*p4d)
			
 
				-				       != p4d_page_vaddr(*p4d_ref));
			
 
				+				BUG_ON(p4d_pgtable(*p4d)
			
 
				+				       != p4d_pgtable(*p4d_ref));
			
 
				 
			
 
				 			if (p4d_none(*p4d))
			
 
				 				set_p4d(p4d, *p4d_ref);
			
--- a/arch/x86/mm/pat/set_memory.c
+++ b/arch/x86/mm/pat/set_memory.c
@@ -1126,7 +1126,7 @@ static void __unmap_pmd_range(pud_t *pud, pmd_t *pmd,
 
				 			      unsigned long start, unsigned long end)
			
 
				 {
			
 
				 	if (unmap_pte_range(pmd, start, end))
			
 
				-		if (try_to_free_pmd_page((pmd_t *)pud_page_vaddr(*pud)))
			
 
				+		if (try_to_free_pmd_page(pud_pgtable(*pud)))
			
 
				 			pud_clear(pud);
			
 
				 }
			
 
				 
			
@@ -1170,7 +1170,7 @@ static void unmap_pmd_range(pud_t *pud, unsigned long start, unsigned long end)
 
				 	 * Try again to free the PMD page if haven't succeeded above.
			
 
				 	 */
			
 
				 	if (!pud_none(*pud))
			
 
				-		if (try_to_free_pmd_page((pmd_t *)pud_page_vaddr(*pud)))
			
 
				+		if (try_to_free_pmd_page(pud_pgtable(*pud)))
			
 
				 			pud_clear(pud);
			
 
				 }
			
 
				 
			
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
@@ -805,7 +805,7 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr)
 
				 	pte_t *pte;
			
 
				 	int i;
			
 
				 
			
 
				-	pmd = (pmd_t *)pud_page_vaddr(*pud);
			
 
				+	pmd = pud_pgtable(*pud);
			
 
				 	pmd_sv = (pmd_t *)__get_free_page(GFP_KERNEL);
			
 
				 	if (!pmd_sv)
			
 
				 		return 0;
			
--- a/arch/xtensa/platforms/iss/network.c
+++ b/arch/xtensa/platforms/iss/network.c
@@ -231,7 +231,7 @@ static int tuntap_probe(struct iss_net_private *lp, int index, char *init)
 
				 
			
 
				 	init += sizeof(TRANSPORT_TUNTAP_NAME) - 1;
			
 
				 	if (*init == ',') {
			
 
				-		rem = split_if_spec(init + 1, &mac_str, &dev_name);
			
 
				+		rem = split_if_spec(init + 1, &mac_str, &dev_name, NULL);
			
 
				 		if (rem != NULL) {
			
 
				 			pr_err("%s: extra garbage on specification : '%s'\n",
			
 
				 			       dev->name, rem);
			
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -2426,6 +2426,7 @@ static u64 adjust_inuse_and_calc_cost(struct ioc_gq *iocg, u64 vtime,
 
				 	u32 hwi, adj_step;
			
 
				 	s64 margin;
			
 
				 	u64 cost, new_inuse;
			
 
				+	unsigned long flags;
			
 
				 
			
 
				 	current_hweight(iocg, NULL, &hwi);
			
 
				 	old_hwi = hwi;
			
@@ -2444,11 +2445,11 @@ static u64 adjust_inuse_and_calc_cost(struct ioc_gq *iocg, u64 vtime,
 
				 	    iocg->inuse == iocg->active)
			
 
				 		return cost;
			
 
				 
			
 
				-	spin_lock_irq(&ioc->lock);
			
 
				+	spin_lock_irqsave(&ioc->lock, flags);
			
 
				 
			
 
				 	/* we own inuse only when @iocg is in the normal active state */
			
 
				 	if (iocg->abs_vdebt || list_empty(&iocg->active_list)) {
			
 
				-		spin_unlock_irq(&ioc->lock);
			
 
				+		spin_unlock_irqrestore(&ioc->lock, flags);
			
 
				 		return cost;
			
 
				 	}
			
 
				 
			
@@ -2469,7 +2470,7 @@ static u64 adjust_inuse_and_calc_cost(struct ioc_gq *iocg, u64 vtime,
 
				 	} while (time_after64(vtime + cost, now->vnow) &&
			
 
				 		 iocg->inuse != iocg->active);
			
 
				 
			
 
				-	spin_unlock_irq(&ioc->lock);
			
 
				+	spin_unlock_irqrestore(&ioc->lock, flags);
			
 
				 
			
 
				 	TRACE_IOCG_PATH(inuse_adjust, iocg, now,
			
 
				 			old_inuse, iocg->inuse, old_hwi, hwi);
			
--- a/block/partitions/amiga.c
+++ b/block/partitions/amiga.c
@@ -11,10 +11,18 @@
 
				 #define pr_fmt(fmt) fmt
			
 
				 
			
 
				 #include <linux/types.h>
			
 
				+#include <linux/mm_types.h>
			
 
				+#include <linux/overflow.h>
			
 
				 #include <linux/affs_hardblocks.h>
			
 
				 
			
 
				 #include "check.h"
			
 
				 
			
 
				+/* magic offsets in partition DosEnvVec */
			
 
				+#define NR_HD	3
			
 
				+#define NR_SECT	5
			
 
				+#define LO_CYL	9
			
 
				+#define HI_CYL	10
			
 
				+
			
 
				 static __inline__ u32
			
 
				 checksum_block(__be32 *m, int size)
			
 
				 {
			
@@ -31,8 +39,12 @@ int amiga_partition(struct parsed_partitions *state)
 
				 	unsigned char *data;
			
 
				 	struct RigidDiskBlock *rdb;
			
 
				 	struct PartitionBlock *pb;
			
 
				-	int start_sect, nr_sects, blk, part, res = 0;
			
 
				-	int blksize = 1;	/* Multiplier for disk block size */
			
 
				+	u64 start_sect, nr_sects;
			
 
				+	sector_t blk, end_sect;
			
 
				+	u32 cylblk;		/* rdb_CylBlocks = nr_heads*sect_per_track */
			
 
				+	u32 nr_hd, nr_sect, lo_cyl, hi_cyl;
			
 
				+	int part, res = 0;
			
 
				+	unsigned int blksize = 1;	/* Multiplier for disk block size */
			
 
				 	int slot = 1;
			
 
				 	char b[BDEVNAME_SIZE];
			
 
				 
			
@@ -41,7 +53,7 @@ int amiga_partition(struct parsed_partitions *state)
 
				 			goto rdb_done;
			
 
				 		data = read_part_sector(state, blk, &sect);
			
 
				 		if (!data) {
			
 
				-			pr_err("Dev %s: unable to read RDB block %d\n",
			
 
				+			pr_err("Dev %s: unable to read RDB block %llu\n",
			
 
				 			       bdevname(state->bdev, b), blk);
			
 
				 			res = -1;
			
 
				 			goto rdb_done;
			
@@ -58,12 +70,12 @@ int amiga_partition(struct parsed_partitions *state)
 
				 		*(__be32 *)(data+0xdc) = 0;
			
 
				 		if (checksum_block((__be32 *)data,
			
 
				 				be32_to_cpu(rdb->rdb_SummedLongs) & 0x7F)==0) {
			
 
				-			pr_err("Trashed word at 0xd0 in block %d ignored in checksum calculation\n",
			
 
				+			pr_err("Trashed word at 0xd0 in block %llu ignored in checksum calculation\n",
			
 
				 			       blk);
			
 
				 			break;
			
 
				 		}
			
 
				 
			
 
				-		pr_err("Dev %s: RDB in block %d has bad checksum\n",
			
 
				+		pr_err("Dev %s: RDB in block %llu has bad checksum\n",
			
 
				 		       bdevname(state->bdev, b), blk);
			
 
				 	}
			
 
				 
			
@@ -79,11 +91,16 @@ int amiga_partition(struct parsed_partitions *state)
 
				 	}
			
 
				 	blk = be32_to_cpu(rdb->rdb_PartitionList);
			
 
				 	put_dev_sector(sect);
			
 
				-	for (part = 1; blk>0 && part<=16; part++, put_dev_sector(sect)) {
			
 
				-		blk *= blksize;	/* Read in terms partition table understands */
			
 
				+	for (part = 1; (s32) blk>0 && part<=16; part++, put_dev_sector(sect)) {
			
 
				+		/* Read in terms partition table understands */
			
 
				+		if (check_mul_overflow(blk, (sector_t) blksize, &blk)) {
			
 
				+			pr_err("Dev %s: overflow calculating partition block %llu! Skipping partitions %u and beyond\n",
			
 
				+				bdevname(state->bdev, b), blk, part);
			
 
				+			break;
			
 
				+		}
			
 
				 		data = read_part_sector(state, blk, &sect);
			
 
				 		if (!data) {
			
 
				-			pr_err("Dev %s: unable to read partition block %d\n",
			
 
				+			pr_err("Dev %s: unable to read partition block %llu\n",
			
 
				 			       bdevname(state->bdev, b), blk);
			
 
				 			res = -1;
			
 
				 			goto rdb_done;
			
@@ -95,19 +112,70 @@ int amiga_partition(struct parsed_partitions *state)
 
				 		if (checksum_block((__be32 *)pb, be32_to_cpu(pb->pb_SummedLongs) & 0x7F) != 0 )
			
 
				 			continue;
			
 
				 
			
 
				-		/* Tell Kernel about it */
			
 
				+		/* RDB gives us more than enough rope to hang ourselves with,
			
 
				+		 * many times over (2^128 bytes if all fields max out).
			
 
				+		 * Some careful checks are in order, so check for potential
			
 
				+		 * overflows.
			
 
				+		 * We are multiplying four 32 bit numbers to one sector_t!
			
 
				+		 */
			
 
				+
			
 
				+		nr_hd   = be32_to_cpu(pb->pb_Environment[NR_HD]);
			
 
				+		nr_sect = be32_to_cpu(pb->pb_Environment[NR_SECT]);
			
 
				+
			
 
				+		/* CylBlocks is total number of blocks per cylinder */
			
 
				+		if (check_mul_overflow(nr_hd, nr_sect, &cylblk)) {
			
 
				+			pr_err("Dev %s: heads*sects %u overflows u32, skipping partition!\n",
			
 
				+				bdevname(state->bdev, b), cylblk);
			
 
				+			continue;
			
 
				+		}
			
 
				+
			
 
				+		/* check for consistency with RDB defined CylBlocks */
			
 
				+		if (cylblk > be32_to_cpu(rdb->rdb_CylBlocks)) {
			
 
				+			pr_warn("Dev %s: cylblk %u > rdb_CylBlocks %u!\n",
			
 
				+				bdevname(state->bdev, b), cylblk,
			
 
				+				be32_to_cpu(rdb->rdb_CylBlocks));
			
 
				+		}
			
 
				+
			
 
				+		/* RDB allows for variable logical block size -
			
 
				+		 * normalize to 512 byte blocks and check result.
			
 
				+		 */
			
 
				+
			
 
				+		if (check_mul_overflow(cylblk, blksize, &cylblk)) {
			
 
				+			pr_err("Dev %s: partition %u bytes per cyl. overflows u32, skipping partition!\n",
			
 
				+				bdevname(state->bdev, b), part);
			
 
				+			continue;
			
 
				+		}
			
 
				+
			
 
				+		/* Calculate partition start and end. Limit of 32 bit on cylblk
			
 
				+		 * guarantees no overflow occurs if LBD support is enabled.
			
 
				+		 */
			
 
				+
			
 
				+		lo_cyl = be32_to_cpu(pb->pb_Environment[LO_CYL]);
			
 
				+		start_sect = ((u64) lo_cyl * cylblk);
			
 
				+
			
 
				+		hi_cyl = be32_to_cpu(pb->pb_Environment[HI_CYL]);
			
 
				+		nr_sects = (((u64) hi_cyl - lo_cyl + 1) * cylblk);
			
 
				 
			
 
				-		nr_sects = (be32_to_cpu(pb->pb_Environment[10]) + 1 -
			
 
				-			    be32_to_cpu(pb->pb_Environment[9])) *
			
 
				-			   be32_to_cpu(pb->pb_Environment[3]) *
			
 
				-			   be32_to_cpu(pb->pb_Environment[5]) *
			
 
				-			   blksize;
			
 
				 		if (!nr_sects)
			
 
				 			continue;
			
 
				-		start_sect = be32_to_cpu(pb->pb_Environment[9]) *
			
 
				-			     be32_to_cpu(pb->pb_Environment[3]) *
			
 
				-			     be32_to_cpu(pb->pb_Environment[5]) *
			
 
				-			     blksize;
			
 
				+
			
 
				+		/* Warn user if partition end overflows u32 (AmigaDOS limit) */
			
 
				+
			
 
				+		if ((start_sect + nr_sects) > UINT_MAX) {
			
 
				+			pr_warn("Dev %s: partition %u (%llu-%llu) needs 64 bit device support!\n",
			
 
				+				bdevname(state->bdev, b), part,
			
 
				+				start_sect, start_sect + nr_sects);
			
 
				+		}
			
 
				+
			
 
				+		if (check_add_overflow(start_sect, nr_sects, &end_sect)) {
			
 
				+			pr_err("Dev %s: partition %u (%llu-%llu) needs LBD device support, skipping partition!\n",
			
 
				+				bdevname(state->bdev, b), part,
			
 
				+				start_sect, end_sect);
			
 
				+			continue;
			
 
				+		}
			
 
				+
			
 
				+		/* Tell Kernel about it */
			
 
				+
			
 
				 		put_partition(state,slot++,start_sect,nr_sects);
			
 
				 		{
			
 
				 			/* Be even more informative to aid mounting */
			
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -82,6 +82,15 @@ static const struct dmi_system_id dmi_lid_quirks[] = {
 
				 		},
			
 
				 		.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_DISABLED,
			
 
				 	},
			
 
				+	{
			
 
				+		/* Nextbook Ares 8A tablet, _LID device always reports lid closed */
			
 
				+		.matches = {
			
 
				+			DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
			
 
				+			DMI_MATCH(DMI_PRODUCT_NAME, "CherryTrail"),
			
 
				+			DMI_MATCH(DMI_BIOS_VERSION, "M882"),
			
 
				+		},
			
 
				+		.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_DISABLED,
			
 
				+	},
			
 
				 	{
			
 
				 		/*
			
 
				 		 * Medion Akoya E2215T, notification of the LID device only
			
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -332,6 +332,22 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
 
				 		DMI_MATCH(DMI_PRODUCT_NAME, "82BK"),
			
 
				 		},
			
 
				 	},
			
 
				+	{
			
 
				+	 .callback = video_detect_force_native,
			
 
				+	 /* Lenovo ThinkPad X131e (3371 AMD version) */
			
 
				+	 .matches = {
			
 
				+		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
			
 
				+		DMI_MATCH(DMI_PRODUCT_NAME, "3371"),
			
 
				+		},
			
 
				+	},
			
 
				+	{
			
 
				+	 .callback = video_detect_force_native,
			
 
				+	 /* Apple iMac11,3 */
			
 
				+	 .matches = {
			
 
				+		DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
			
 
				+		DMI_MATCH(DMI_PRODUCT_NAME, "iMac11,3"),
			
 
				+		},
			
 
				+	},
			
 
				 	{
			
 
				 	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1217249 */
			
 
				 	 .callback = video_detect_force_native,
			
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -2835,10 +2835,10 @@ static int genpd_parse_state(struct genpd_power_state *genpd_state,
 
				 
			
 
				 	err = of_property_read_u32(state_node, "min-residency-us", &residency);
			
 
				 	if (!err)
			
 
				-		genpd_state->residency_ns = 1000 * residency;
			
 
				+		genpd_state->residency_ns = 1000LL * residency;
			
 
				 
			
 
				-	genpd_state->power_on_latency_ns = 1000 * exit_latency;
			
 
				-	genpd_state->power_off_latency_ns = 1000 * entry_latency;
			
 
				+	genpd_state->power_on_latency_ns = 1000LL * exit_latency;
			
 
				+	genpd_state->power_off_latency_ns = 1000LL * entry_latency;
			
 
				 	genpd_state->fwnode = &state_node->fwnode;
			
 
				 
			
 
				 	return 0;
			
--- a/drivers/base/regmap/regmap-i2c.c
+++ b/drivers/base/regmap/regmap-i2c.c
@@ -242,8 +242,8 @@ static int regmap_i2c_smbus_i2c_read(void *context, const void *reg,
 
				 static const struct regmap_bus regmap_i2c_smbus_i2c_block = {
			
 
				 	.write = regmap_i2c_smbus_i2c_write,
			
 
				 	.read = regmap_i2c_smbus_i2c_read,
			
 
				-	.max_raw_read = I2C_SMBUS_BLOCK_MAX,
			
 
				-	.max_raw_write = I2C_SMBUS_BLOCK_MAX,
			
 
				+	.max_raw_read = I2C_SMBUS_BLOCK_MAX - 1,
			
 
				+	.max_raw_write = I2C_SMBUS_BLOCK_MAX - 1,
			
 
				 };
			
 
				 
			
 
				 static int regmap_i2c_smbus_i2c_write_reg16(void *context, const void *data,
			
@@ -299,8 +299,8 @@ static int regmap_i2c_smbus_i2c_read_reg16(void *context, const void *reg,
 
				 static const struct regmap_bus regmap_i2c_smbus_i2c_block_reg16 = {
			
 
				 	.write = regmap_i2c_smbus_i2c_write_reg16,
			
 
				 	.read = regmap_i2c_smbus_i2c_read_reg16,
			
 
				-	.max_raw_read = I2C_SMBUS_BLOCK_MAX,
			
 
				-	.max_raw_write = I2C_SMBUS_BLOCK_MAX,
			
 
				+	.max_raw_read = I2C_SMBUS_BLOCK_MAX - 2,
			
 
				+	.max_raw_write = I2C_SMBUS_BLOCK_MAX - 2,
			
 
				 };
			
 
				 
			
 
				 static const struct regmap_bus *regmap_get_i2c_bus(struct i2c_client *i2c,
			
--- a/drivers/base/regmap/regmap-spi-avmm.c
+++ b/drivers/base/regmap/regmap-spi-avmm.c
@@ -666,7 +666,7 @@ static const struct regmap_bus regmap_spi_avmm_bus = {
 
				 	.reg_format_endian_default = REGMAP_ENDIAN_NATIVE,
			
 
				 	.val_format_endian_default = REGMAP_ENDIAN_NATIVE,
			
 
				 	.max_raw_read = SPI_AVMM_VAL_SIZE * MAX_READ_CNT,
			
 
				-	.max_raw_write = SPI_AVMM_REG_SIZE + SPI_AVMM_VAL_SIZE * MAX_WRITE_CNT,
			
 
				+	.max_raw_write = SPI_AVMM_VAL_SIZE * MAX_WRITE_CNT,
			
 
				 	.free_context = spi_avmm_bridge_ctx_free,
			
 
				 };
			
 
				 
			
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1998,8 +1998,6 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,
 
				 	size_t val_count = val_len / val_bytes;
			
 
				 	size_t chunk_count, chunk_bytes;
			
 
				 	size_t chunk_regs = val_count;
			
 
				-	size_t max_data = map->max_raw_write - map->format.reg_bytes -
			
 
				-			map->format.pad_bytes;
			
 
				 	int ret, i;
			
 
				 
			
 
				 	if (!val_count)
			
@@ -2007,8 +2005,8 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,
 
				 
			
 
				 	if (map->use_single_write)
			
 
				 		chunk_regs = 1;
			
 
				-	else if (map->max_raw_write && val_len > max_data)
			
 
				-		chunk_regs = max_data / val_bytes;
			
 
				+	else if (map->max_raw_write && val_len > map->max_raw_write)
			
 
				+		chunk_regs = map->max_raw_write / val_bytes;
			
 
				 
			
 
				 	chunk_count = val_count / chunk_regs;
			
 
				 	chunk_bytes = chunk_regs * val_bytes;
			
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1723,7 +1723,8 @@ static int nbd_dev_add(int index)
 
				 		if (err == -ENOSPC)
			
 
				 			err = -EEXIST;
			
 
				 	} else {
			
 
				-		err = idr_alloc(&nbd_index_idr, nbd, 0, 0, GFP_KERNEL);
			
 
				+		err = idr_alloc(&nbd_index_idr, nbd, 0,
			
 
				+				(MINORMASK >> part_shift) + 1, GFP_KERNEL);
			
 
				 		if (err >= 0)
			
 
				 			index = err;
			
 
				 	}
			
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -1748,7 +1748,7 @@ static u32 sysc_quirk_dispc(struct sysc *ddata, int dispc_offset,
 
				 	if (!ddata->module_va)
			
 
				 		return -EIO;
			
 
				 
			
 
				-	/* DISP_CONTROL */
			
 
				+	/* DISP_CONTROL, shut down lcd and digit on disable if enabled */
			
 
				 	val = sysc_read(ddata, dispc_offset + 0x40);
			
 
				 	lcd_en = val & lcd_en_mask;
			
 
				 	digit_en = val & digit_en_mask;
			
@@ -1760,7 +1760,7 @@ static u32 sysc_quirk_dispc(struct sysc *ddata, int dispc_offset,
 
				 		else
			
 
				 			irq_mask |= BIT(2) | BIT(3);	/* EVSYNC bits */
			
 
				 	}
			
 
				-	if (disable & (lcd_en | digit_en))
			
 
				+	if (disable && (lcd_en || digit_en))
			
 
				 		sysc_write(ddata, dispc_offset + 0x40,
			
 
				 			   val & ~(lcd_en_mask | digit_en_mask));
			
 
				 
			
--- a/drivers/char/hw_random/imx-rngc.c
+++ b/drivers/char/hw_random/imx-rngc.c
@@ -110,7 +110,7 @@ static int imx_rngc_self_test(struct imx_rngc *rngc)
 
				 	cmd = readl(rngc->base + RNGC_COMMAND);
			
 
				 	writel(cmd | RNGC_CMD_SELF_TEST, rngc->base + RNGC_COMMAND);
			
 
				 
			
 
				-	ret = wait_for_completion_timeout(&rngc->rng_op_done, RNGC_TIMEOUT);
			
 
				+	ret = wait_for_completion_timeout(&rngc->rng_op_done, msecs_to_jiffies(RNGC_TIMEOUT));
			
 
				 	imx_rngc_irq_mask_clear(rngc);
			
 
				 	if (!ret)
			
 
				 		return -ETIMEDOUT;
			
@@ -187,9 +187,7 @@ static int imx_rngc_init(struct hwrng *rng)
 
				 		cmd = readl(rngc->base + RNGC_COMMAND);
			
 
				 		writel(cmd | RNGC_CMD_SEED, rngc->base + RNGC_COMMAND);
			
 
				 
			
 
				-		ret = wait_for_completion_timeout(&rngc->rng_op_done,
			
 
				-				RNGC_TIMEOUT);
			
 
				-
			
 
				+		ret = wait_for_completion_timeout(&rngc->rng_op_done, msecs_to_jiffies(RNGC_TIMEOUT));
			
 
				 		if (!ret) {
			
 
				 			ret = -ETIMEDOUT;
			
 
				 			goto err;
			
--- a/drivers/char/hw_random/st-rng.c
+++ b/drivers/char/hw_random/st-rng.c
@@ -42,7 +42,6 @@
 
				 
			
 
				 struct st_rng_data {
			
 
				 	void __iomem	*base;
			
 
				-	struct clk	*clk;
			
 
				 	struct hwrng	ops;
			
 
				 };
			
 
				 
			
@@ -85,26 +84,18 @@ static int st_rng_probe(struct platform_device *pdev)
 
				 	if (IS_ERR(base))
			
 
				 		return PTR_ERR(base);
			
 
				 
			
 
				-	clk = devm_clk_get(&pdev->dev, NULL);
			
 
				+	clk = devm_clk_get_enabled(&pdev->dev, NULL);
			
 
				 	if (IS_ERR(clk))
			
 
				 		return PTR_ERR(clk);
			
 
				 
			
 
				-	ret = clk_prepare_enable(clk);
			
 
				-	if (ret)
			
 
				-		return ret;
			
 
				-
			
 
				 	ddata->ops.priv	= (unsigned long)ddata;
			
 
				 	ddata->ops.read	= st_rng_read;
			
 
				 	ddata->ops.name	= pdev->name;
			
 
				 	ddata->base	= base;
			
 
				-	ddata->clk	= clk;
			
 
				-
			
 
				-	dev_set_drvdata(&pdev->dev, ddata);
			
 
				 
			
 
				 	ret = devm_hwrng_register(&pdev->dev, &ddata->ops);
			
 
				 	if (ret) {
			
 
				 		dev_err(&pdev->dev, "Failed to register HW RNG\n");
			
 
				-		clk_disable_unprepare(clk);
			
 
				 		return ret;
			
 
				 	}
			
 
				 
			
@@ -113,15 +104,6 @@ static int st_rng_probe(struct platform_device *pdev)
 
				 	return 0;
			
 
				 }
			
 
				 
			
 
				-static int st_rng_remove(struct platform_device *pdev)
			
 
				-{
			
 
				-	struct st_rng_data *ddata = dev_get_drvdata(&pdev->dev);
			
 
				-
			
 
				-	clk_disable_unprepare(ddata->clk);
			
 
				-
			
 
				-	return 0;
			
 
				-}
			
 
				-
			
 
				 static const struct of_device_id st_rng_match[] __maybe_unused = {
			
 
				 	{ .compatible = "st,rng" },
			
 
				 	{},
			
@@ -134,7 +116,6 @@ static struct platform_driver st_rng_driver = {
 
				 		.of_match_table = of_match_ptr(st_rng_match),
			
 
				 	},
			
 
				 	.probe = st_rng_probe,
			
 
				-	.remove = st_rng_remove
			
 
				 };
			
 
				 
			
 
				 module_platform_driver(st_rng_driver);
			
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
@@ -4,6 +4,7 @@
 
				  *  Copyright (C) 2007, 2008 Rusty Russell IBM Corporation
			
 
				  */
			
 
				 
			
 
				+#include <asm/barrier.h>
			
 
				 #include <linux/err.h>
			
 
				 #include <linux/hw_random.h>
			
 
				 #include <linux/scatterlist.h>
			
@@ -20,12 +21,12 @@ struct virtrng_info {
 
				 	struct virtqueue *vq;
			
 
				 	char name[25];
			
 
				 	int index;
			
 
				-	bool busy;
			
 
				 	bool hwrng_register_done;
			
 
				 	bool hwrng_removed;
			
 
				 	/* data transfer */
			
 
				 	struct completion have_data;
			
 
				 	unsigned int data_avail;
			
 
				+	unsigned int data_idx;
			
 
				 	/* minimal size returned by rng_buffer_size() */
			
 
				 #if SMP_CACHE_BYTES < 32
			
 
				 	u8 data[32];
			
@@ -37,19 +38,23 @@ struct virtrng_info {
 
				 static void random_recv_done(struct virtqueue *vq)
			
 
				 {
			
 
				 	struct virtrng_info *vi = vq->vdev->priv;
			
 
				+	unsigned int len;
			
 
				 
			
 
				 	/* We can get spurious callbacks, e.g. shared IRQs + virtio_pci. */
			
 
				-	if (!virtqueue_get_buf(vi->vq, &vi->data_avail))
			
 
				+	if (!virtqueue_get_buf(vi->vq, &len))
			
 
				 		return;
			
 
				 
			
 
				+	smp_store_release(&vi->data_avail, len);
			
 
				 	complete(&vi->have_data);
			
 
				 }
			
 
				 
			
 
				-/* The host will fill any buffer we give it with sweet, sweet randomness. */
			
 
				-static void register_buffer(struct virtrng_info *vi)
			
 
				+static void request_entropy(struct virtrng_info *vi)
			
 
				 {
			
 
				 	struct scatterlist sg;
			
 
				 
			
 
				+	reinit_completion(&vi->have_data);
			
 
				+	vi->data_idx = 0;
			
 
				+
			
 
				 	sg_init_one(&sg, vi->data, sizeof(vi->data));
			
 
				 
			
 
				 	/* There should always be room for one buffer. */
			
@@ -58,6 +63,18 @@ static void register_buffer(struct virtrng_info *vi)
 
				 	virtqueue_kick(vi->vq);
			
 
				 }
			
 
				 
			
 
				+static unsigned int copy_data(struct virtrng_info *vi, void *buf,
			
 
				+			      unsigned int size)
			
 
				+{
			
 
				+	size = min_t(unsigned int, size, vi->data_avail);
			
 
				+	memcpy(buf, vi->data + vi->data_idx, size);
			
 
				+	vi->data_idx += size;
			
 
				+	vi->data_avail -= size;
			
 
				+	if (vi->data_avail == 0)
			
 
				+		request_entropy(vi);
			
 
				+	return size;
			
 
				+}
			
 
				+
			
 
				 static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)
			
 
				 {
			
 
				 	int ret;
			
@@ -68,35 +85,37 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)
 
				 	if (vi->hwrng_removed)
			
 
				 		return -ENODEV;
			
 
				 
			
 
				-	if (!vi->busy) {
			
 
				-		vi->busy = true;
			
 
				-		reinit_completion(&vi->have_data);
			
 
				-		register_buffer(vi);
			
 
				+	read = 0;
			
 
				+
			
 
				+	/* copy available data */
			
 
				+	if (smp_load_acquire(&vi->data_avail)) {
			
 
				+		chunk = copy_data(vi, buf, size);
			
 
				+		size -= chunk;
			
 
				+		read += chunk;
			
 
				 	}
			
 
				 
			
 
				 	if (!wait)
			
 
				-		return 0;
			
 
				+		return read;
			
 
				 
			
 
				-	read = 0;
			
 
				+	/* We have already copied available entropy,
			
 
				+	 * so either size is 0 or data_avail is 0
			
 
				+	 */
			
 
				 	while (size != 0) {
			
 
				+		/* data_avail is 0 but a request is pending */
			
 
				 		ret = wait_for_completion_killable(&vi->have_data);
			
 
				 		if (ret < 0)
			
 
				 			return ret;
			
 
				+		/* if vi->data_avail is 0, we have been interrupted
			
 
				+		 * by a cleanup, but buffer stays in the queue
			
 
				+		 */
			
 
				+		if (vi->data_avail == 0)
			
 
				+			return read;
			
 
				 
			
 
				-		chunk = min_t(unsigned int, size, vi->data_avail);
			
 
				-		memcpy(buf + read, vi->data, chunk);
			
 
				-		read += chunk;
			
 
				+		chunk = copy_data(vi, buf + read, size);
			
 
				 		size -= chunk;
			
 
				-		vi->data_avail = 0;
			
 
				-
			
 
				-		if (size != 0) {
			
 
				-			reinit_completion(&vi->have_data);
			
 
				-			register_buffer(vi);
			
 
				-		}
			
 
				+		read += chunk;
			
 
				 	}
			
 
				 
			
 
				-	vi->busy = false;
			
 
				-
			
 
				 	return read;
			
 
				 }
			
 
				 
			
@@ -104,8 +123,7 @@ static void virtio_cleanup(struct hwrng *rng)
 
				 {
			
 
				 	struct virtrng_info *vi = (struct virtrng_info *)rng->priv;
			
 
				 
			
 
				-	if (vi->busy)
			
 
				-		wait_for_completion(&vi->have_data);
			
 
				+	complete(&vi->have_data);
			
 
				 }
			
 
				 
			
 
				 static int probe_common(struct virtio_device *vdev)
			
@@ -141,6 +159,9 @@ static int probe_common(struct virtio_device *vdev)
 
				 		goto err_find;
			
 
				 	}
			
 
				 
			
 
				+	/* we always have a pending entropy request */
			
 
				+	request_entropy(vi);
			
 
				+
			
 
				 	return 0;
			
 
				 
			
 
				 err_find:
			
@@ -156,9 +177,9 @@ static void remove_common(struct virtio_device *vdev)
 
				 
			
 
				 	vi->hwrng_removed = true;
			
 
				 	vi->data_avail = 0;
			
 
				+	vi->data_idx = 0;
			
 
				 	complete(&vi->have_data);
			
 
				 	vdev->config->reset(vdev);
			
 
				-	vi->busy = false;
			
 
				 	if (vi->hwrng_register_done)
			
 
				 		hwrng_unregister(&vi->hwrng);
			
 
				 	vdev->config->del_vqs(vdev);
			
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -731,7 +731,9 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id)
 
				 		wake_up_interruptible(&priv->int_queue);
			
 
				 
			
 
				 	/* Clear interrupts handled with TPM_EOI */
			
 
				+	tpm_tis_request_locality(chip, 0);
			
 
				 	rc = tpm_tis_write32(priv, TPM_INT_STATUS(priv->locality), interrupt);
			
 
				+	tpm_tis_relinquish_locality(chip, 0);
			
 
				 	if (rc < 0)
			
 
				 		return IRQ_NONE;
			
 
				 
			
--- a/drivers/char/tpm/tpm_vtpm_proxy.c
+++ b/drivers/char/tpm/tpm_vtpm_proxy.c
@@ -683,37 +683,21 @@ static struct miscdevice vtpmx_miscdev = {
 
				 	.fops = &vtpmx_fops,
			
 
				 };
			
 
				 
			
 
				-static int vtpmx_init(void)
			
 
				-{
			
 
				-	return misc_register(&vtpmx_miscdev);
			
 
				-}
			
 
				-
			
 
				-static void vtpmx_cleanup(void)
			
 
				-{
			
 
				-	misc_deregister(&vtpmx_miscdev);
			
 
				-}
			
 
				-
			
 
				 static int __init vtpm_module_init(void)
			
 
				 {
			
 
				 	int rc;
			
 
				 
			
 
				-	rc = vtpmx_init();
			
 
				-	if (rc) {
			
 
				-		pr_err("couldn't create vtpmx device\n");
			
 
				-		return rc;
			
 
				-	}
			
 
				-
			
 
				 	workqueue = create_workqueue("tpm-vtpm");
			
 
				 	if (!workqueue) {
			
 
				 		pr_err("couldn't create workqueue\n");
			
 
				-		rc = -ENOMEM;
			
 
				-		goto err_vtpmx_cleanup;
			
 
				+		return -ENOMEM;
			
 
				 	}
			
 
				 
			
 
				-	return 0;
			
 
				-
			
 
				-err_vtpmx_cleanup:
			
 
				-	vtpmx_cleanup();
			
 
				+	rc = misc_register(&vtpmx_miscdev);
			
 
				+	if (rc) {
			
 
				+		pr_err("couldn't create vtpmx device\n");
			
 
				+		destroy_workqueue(workqueue);
			
 
				+	}
			
 
				 
			
 
				 	return rc;
			
 
				 }
			
@@ -721,7 +705,7 @@ err_vtpmx_cleanup:
 
				 static void __exit vtpm_module_exit(void)
			
 
				 {
			
 
				 	destroy_workqueue(workqueue);
			
 
				-	vtpmx_cleanup();
			
 
				+	misc_deregister(&vtpmx_miscdev);
			
 
				 }
			
 
				 
			
 
				 module_init(vtpm_module_init);
			
--- a/drivers/clk/clk-cdce925.c
+++ b/drivers/clk/clk-cdce925.c
@@ -705,6 +705,10 @@ static int cdce925_probe(struct i2c_client *client,
 
				 	for (i = 0; i < data->chip_info->num_plls; ++i) {
			
 
				 		pll_clk_name[i] = kasprintf(GFP_KERNEL, "%pOFn.pll%d",
			
 
				 			client->dev.of_node, i);
			
 
				+		if (!pll_clk_name[i]) {
			
 
				+			err = -ENOMEM;
			
 
				+			goto error;
			
 
				+		}
			
 
				 		init.name = pll_clk_name[i];
			
 
				 		data->pll[i].chip = data;
			
 
				 		data->pll[i].hw.init = &init;
			
@@ -746,6 +750,10 @@ static int cdce925_probe(struct i2c_client *client,
 
				 	init.num_parents = 1;
			
 
				 	init.parent_names = &parent_name; /* Mux Y1 to input */
			
 
				 	init.name = kasprintf(GFP_KERNEL, "%pOFn.Y1", client->dev.of_node);
			
 
				+	if (!init.name) {
			
 
				+		err = -ENOMEM;
			
 
				+		goto error;
			
 
				+	}
			
 
				 	data->clk[0].chip = data;
			
 
				 	data->clk[0].hw.init = &init;
			
 
				 	data->clk[0].index = 0;
			
@@ -764,6 +772,10 @@ static int cdce925_probe(struct i2c_client *client,
 
				 	for (i = 1; i < data->chip_info->num_outputs; ++i) {
			
 
				 		init.name = kasprintf(GFP_KERNEL, "%pOFn.Y%d",
			
 
				 			client->dev.of_node, i+1);
			
 
				+		if (!init.name) {
			
 
				+			err = -ENOMEM;
			
 
				+			goto error;
			
 
				+		}
			
 
				 		data->clk[i].chip = data;
			
 
				 		data->clk[i].hw.init = &init;
			
 
				 		data->clk[i].index = i;
			
--- a/drivers/clk/clk-si5341.c
+++ b/drivers/clk/clk-si5341.c
@@ -19,6 +19,7 @@
 
				 #include <linux/i2c.h>
			
 
				 #include <linux/module.h>
			
 
				 #include <linux/regmap.h>
			
 
				+#include <linux/regulator/consumer.h>
			
 
				 #include <linux/slab.h>
			
 
				 #include <asm/unaligned.h>
			
 
				 
			
@@ -59,6 +60,7 @@ struct clk_si5341_synth {
 
				 struct clk_si5341_output {
			
 
				 	struct clk_hw hw;
			
 
				 	struct clk_si5341 *data;
			
 
				+	struct regulator *vddo_reg;
			
 
				 	u8 index;
			
 
				 };
			
 
				 #define to_clk_si5341_output(_hw) \
			
@@ -84,6 +86,7 @@ struct clk_si5341 {
 
				 struct clk_si5341_output_config {
			
 
				 	u8 out_format_drv_bits;
			
 
				 	u8 out_cm_ampl_bits;
			
 
				+	u8 vdd_sel_bits;
			
 
				 	bool synth_master;
			
 
				 	bool always_on;
			
 
				 };
			
@@ -136,6 +139,8 @@ struct clk_si5341_output_config {
 
				 #define SI5341_OUT_R_REG(output)	\
			
 
				 			((output)->data->reg_rdiv_offset[(output)->index])
			
 
				 
			
 
				+#define SI5341_OUT_MUX_VDD_SEL_MASK 0x38
			
 
				+
			
 
				 /* Synthesize N divider */
			
 
				 #define SI5341_SYNTH_N_NUM(x)	(0x0302 + ((x) * 11))
			
 
				 #define SI5341_SYNTH_N_DEN(x)	(0x0308 + ((x) * 11))
			
@@ -1250,11 +1255,11 @@ static const struct regmap_config si5341_regmap_config = {
 
				 	.volatile_table = &si5341_regmap_volatile,
			
 
				 };
			
 
				 
			
 
				-static int si5341_dt_parse_dt(struct i2c_client *client,
			
 
				-	struct clk_si5341_output_config *config)
			
 
				+static int si5341_dt_parse_dt(struct clk_si5341 *data,
			
 
				+			      struct clk_si5341_output_config *config)
			
 
				 {
			
 
				 	struct device_node *child;
			
 
				-	struct device_node *np = client->dev.of_node;
			
 
				+	struct device_node *np = data->i2c_client->dev.of_node;
			
 
				 	u32 num;
			
 
				 	u32 val;
			
 
				 
			
@@ -1263,13 +1268,13 @@ static int si5341_dt_parse_dt(struct i2c_client *client,
 
				 
			
 
				 	for_each_child_of_node(np, child) {
			
 
				 		if (of_property_read_u32(child, "reg", &num)) {
			
 
				-			dev_err(&client->dev, "missing reg property of %s\n",
			
 
				+			dev_err(&data->i2c_client->dev, "missing reg property of %s\n",
			
 
				 				child->name);
			
 
				 			goto put_child;
			
 
				 		}
			
 
				 
			
 
				 		if (num >= SI5341_MAX_NUM_OUTPUTS) {
			
 
				-			dev_err(&client->dev, "invalid clkout %d\n", num);
			
 
				+			dev_err(&data->i2c_client->dev, "invalid clkout %d\n", num);
			
 
				 			goto put_child;
			
 
				 		}
			
 
				 
			
@@ -1288,7 +1293,7 @@ static int si5341_dt_parse_dt(struct i2c_client *client,
 
				 				config[num].out_format_drv_bits |= 0xc0;
			
 
				 				break;
			
 
				 			default:
			
 
				-				dev_err(&client->dev,
			
 
				+				dev_err(&data->i2c_client->dev,
			
 
				 					"invalid silabs,format %u for %u\n",
			
 
				 					val, num);
			
 
				 				goto put_child;
			
@@ -1301,7 +1306,7 @@ static int si5341_dt_parse_dt(struct i2c_client *client,
 
				 
			
 
				 		if (!of_property_read_u32(child, "silabs,common-mode", &val)) {
			
 
				 			if (val > 0xf) {
			
 
				-				dev_err(&client->dev,
			
 
				+				dev_err(&data->i2c_client->dev,
			
 
				 					"invalid silabs,common-mode %u\n",
			
 
				 					val);
			
 
				 				goto put_child;
			
@@ -1312,7 +1317,7 @@ static int si5341_dt_parse_dt(struct i2c_client *client,
 
				 
			
 
				 		if (!of_property_read_u32(child, "silabs,amplitude", &val)) {
			
 
				 			if (val > 0xf) {
			
 
				-				dev_err(&client->dev,
			
 
				+				dev_err(&data->i2c_client->dev,
			
 
				 					"invalid silabs,amplitude %u\n",
			
 
				 					val);
			
 
				 				goto put_child;
			
@@ -1329,6 +1334,34 @@ static int si5341_dt_parse_dt(struct i2c_client *client,
 
				 
			
 
				 		config[num].always_on =
			
 
				 			of_property_read_bool(child, "always-on");
			
 
				+
			
 
				+		config[num].vdd_sel_bits = 0x08;
			
 
				+		if (data->clk[num].vddo_reg) {
			
 
				+			int vdd = regulator_get_voltage(data->clk[num].vddo_reg);
			
 
				+
			
 
				+			switch (vdd) {
			
 
				+			case 3300000:
			
 
				+				config[num].vdd_sel_bits |= 0 << 4;
			
 
				+				break;
			
 
				+			case 1800000:
			
 
				+				config[num].vdd_sel_bits |= 1 << 4;
			
 
				+				break;
			
 
				+			case 2500000:
			
 
				+				config[num].vdd_sel_bits |= 2 << 4;
			
 
				+				break;
			
 
				+			default:
			
 
				+				dev_err(&data->i2c_client->dev,
			
 
				+					"unsupported vddo voltage %d for %s\n",
			
 
				+					vdd, child->name);
			
 
				+				goto put_child;
			
 
				+			}
			
 
				+		} else {
			
 
				+			/* chip seems to default to 2.5V when not set */
			
 
				+			dev_warn(&data->i2c_client->dev,
			
 
				+				"no regulator set, defaulting vdd_sel to 2.5V for %s\n",
			
 
				+				child->name);
			
 
				+			config[num].vdd_sel_bits |= 2 << 4;
			
 
				+		}
			
 
				 	}
			
 
				 
			
 
				 	return 0;
			
@@ -1417,6 +1450,94 @@ static int si5341_clk_select_active_input(struct clk_si5341 *data)
 
				 	return res;
			
 
				 }
			
 
				 
			
 
				+static ssize_t input_present_show(struct device *dev,
			
 
				+				  struct device_attribute *attr,
			
 
				+				  char *buf)
			
 
				+{
			
 
				+	struct clk_si5341 *data = dev_get_drvdata(dev);
			
 
				+	u32 status;
			
 
				+	int res = regmap_read(data->regmap, SI5341_STATUS, &status);
			
 
				+
			
 
				+	if (res < 0)
			
 
				+		return res;
			
 
				+	res = !(status & SI5341_STATUS_LOSREF);
			
 
				+	return snprintf(buf, PAGE_SIZE, "%d\n", res);
			
 
				+}
			
 
				+static DEVICE_ATTR_RO(input_present);
			
 
				+
			
 
				+static ssize_t input_present_sticky_show(struct device *dev,
			
 
				+					 struct device_attribute *attr,
			
 
				+					 char *buf)
			
 
				+{
			
 
				+	struct clk_si5341 *data = dev_get_drvdata(dev);
			
 
				+	u32 status;
			
 
				+	int res = regmap_read(data->regmap, SI5341_STATUS_STICKY, &status);
			
 
				+
			
 
				+	if (res < 0)
			
 
				+		return res;
			
 
				+	res = !(status & SI5341_STATUS_LOSREF);
			
 
				+	return snprintf(buf, PAGE_SIZE, "%d\n", res);
			
 
				+}
			
 
				+static DEVICE_ATTR_RO(input_present_sticky);
			
 
				+
			
 
				+static ssize_t pll_locked_show(struct device *dev,
			
 
				+			       struct device_attribute *attr,
			
 
				+			       char *buf)
			
 
				+{
			
 
				+	struct clk_si5341 *data = dev_get_drvdata(dev);
			
 
				+	u32 status;
			
 
				+	int res = regmap_read(data->regmap, SI5341_STATUS, &status);
			
 
				+
			
 
				+	if (res < 0)
			
 
				+		return res;
			
 
				+	res = !(status & SI5341_STATUS_LOL);
			
 
				+	return snprintf(buf, PAGE_SIZE, "%d\n", res);
			
 
				+}
			
 
				+static DEVICE_ATTR_RO(pll_locked);
			
 
				+
			
 
				+static ssize_t pll_locked_sticky_show(struct device *dev,
			
 
				+				      struct device_attribute *attr,
			
 
				+				      char *buf)
			
 
				+{
			
 
				+	struct clk_si5341 *data = dev_get_drvdata(dev);
			
 
				+	u32 status;
			
 
				+	int res = regmap_read(data->regmap, SI5341_STATUS_STICKY, &status);
			
 
				+
			
 
				+	if (res < 0)
			
 
				+		return res;
			
 
				+	res = !(status & SI5341_STATUS_LOL);
			
 
				+	return snprintf(buf, PAGE_SIZE, "%d\n", res);
			
 
				+}
			
 
				+static DEVICE_ATTR_RO(pll_locked_sticky);
			
 
				+
			
 
				+static ssize_t clear_sticky_store(struct device *dev,
			
 
				+				  struct device_attribute *attr,
			
 
				+				  const char *buf, size_t count)
			
 
				+{
			
 
				+	struct clk_si5341 *data = dev_get_drvdata(dev);
			
 
				+	long val;
			
 
				+
			
 
				+	if (kstrtol(buf, 10, &val))
			
 
				+		return -EINVAL;
			
 
				+	if (val) {
			
 
				+		int res = regmap_write(data->regmap, SI5341_STATUS_STICKY, 0);
			
 
				+
			
 
				+		if (res < 0)
			
 
				+			return res;
			
 
				+	}
			
 
				+	return count;
			
 
				+}
			
 
				+static DEVICE_ATTR_WO(clear_sticky);
			
 
				+
			
 
				+static const struct attribute *si5341_attributes[] = {
			
 
				+	&dev_attr_input_present.attr,
			
 
				+	&dev_attr_input_present_sticky.attr,
			
 
				+	&dev_attr_pll_locked.attr,
			
 
				+	&dev_attr_pll_locked_sticky.attr,
			
 
				+	&dev_attr_clear_sticky.attr,
			
 
				+	NULL
			
 
				+};
			
 
				+
			
 
				 static int si5341_probe(struct i2c_client *client,
			
 
				 		const struct i2c_device_id *id)
			
 
				 {
			
@@ -1424,7 +1545,7 @@ static int si5341_probe(struct i2c_client *client,
 
				 	struct clk_init_data init;
			
 
				 	struct clk *input;
			
 
				 	const char *root_clock_name;
			
 
				-	const char *synth_clock_names[SI5341_NUM_SYNTH];
			
 
				+	const char *synth_clock_names[SI5341_NUM_SYNTH] = { NULL };
			
 
				 	int err;
			
 
				 	unsigned int i;
			
 
				 	struct clk_si5341_output_config config[SI5341_MAX_NUM_OUTPUTS];
			
@@ -1454,9 +1575,33 @@ static int si5341_probe(struct i2c_client *client,
 
				 		}
			
 
				 	}
			
 
				 
			
 
				-	err = si5341_dt_parse_dt(client, config);
			
 
				+	for (i = 0; i < SI5341_MAX_NUM_OUTPUTS; ++i) {
			
 
				+		char reg_name[10];
			
 
				+
			
 
				+		snprintf(reg_name, sizeof(reg_name), "vddo%d", i);
			
 
				+		data->clk[i].vddo_reg = devm_regulator_get_optional(
			
 
				+			&client->dev, reg_name);
			
 
				+		if (IS_ERR(data->clk[i].vddo_reg)) {
			
 
				+			err = PTR_ERR(data->clk[i].vddo_reg);
			
 
				+			data->clk[i].vddo_reg = NULL;
			
 
				+			if (err == -ENODEV)
			
 
				+				continue;
			
 
				+			goto cleanup;
			
 
				+		} else {
			
 
				+			err = regulator_enable(data->clk[i].vddo_reg);
			
 
				+			if (err) {
			
 
				+				dev_err(&client->dev,
			
 
				+					"failed to enable %s regulator: %d\n",
			
 
				+					reg_name, err);
			
 
				+				data->clk[i].vddo_reg = NULL;
			
 
				+				goto cleanup;
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+	err = si5341_dt_parse_dt(data, config);
			
 
				 	if (err)
			
 
				-		return err;
			
 
				+		goto cleanup;
			
 
				 
			
 
				 	if (of_property_read_string(client->dev.of_node, "clock-output-names",
			
 
				 			&init.name))
			
@@ -1464,21 +1609,23 @@ static int si5341_probe(struct i2c_client *client,
 
				 	root_clock_name = init.name;
			
 
				 
			
 
				 	data->regmap = devm_regmap_init_i2c(client, &si5341_regmap_config);
			
 
				-	if (IS_ERR(data->regmap))
			
 
				-		return PTR_ERR(data->regmap);
			
 
				+	if (IS_ERR(data->regmap)) {
			
 
				+		err = PTR_ERR(data->regmap);
			
 
				+		goto cleanup;
			
 
				+	}
			
 
				 
			
 
				 	i2c_set_clientdata(client, data);
			
 
				 
			
 
				 	err = si5341_probe_chip_id(data);
			
 
				 	if (err < 0)
			
 
				-		return err;
			
 
				+		goto cleanup;
			
 
				 
			
 
				 	if (of_property_read_bool(client->dev.of_node, "silabs,reprogram")) {
			
 
				 		initialization_required = true;
			
 
				 	} else {
			
 
				 		err = si5341_is_programmed_already(data);
			
 
				 		if (err < 0)
			
 
				-			return err;
			
 
				+			goto cleanup;
			
 
				 
			
 
				 		initialization_required = !err;
			
 
				 	}
			
@@ -1487,11 +1634,11 @@ static int si5341_probe(struct i2c_client *client,
 
				 		/* Populate the regmap cache in preparation for "cache only" */
			
 
				 		err = si5341_read_settings(data);
			
 
				 		if (err < 0)
			
 
				-			return err;
			
 
				+			goto cleanup;
			
 
				 
			
 
				 		err = si5341_send_preamble(data);
			
 
				 		if (err < 0)
			
 
				-			return err;
			
 
				+			goto cleanup;
			
 
				 
			
 
				 		/*
			
 
				 		 * We intend to send all 'final' register values in a single
			
@@ -1504,19 +1651,19 @@ static int si5341_probe(struct i2c_client *client,
 
				 		err = si5341_write_multiple(data, si5341_reg_defaults,
			
 
				 					ARRAY_SIZE(si5341_reg_defaults));
			
 
				 		if (err < 0)
			
 
				-			return err;
			
 
				+			goto cleanup;
			
 
				 	}
			
 
				 
			
 
				 	/* Input must be up and running at this point */
			
 
				 	err = si5341_clk_select_active_input(data);
			
 
				 	if (err < 0)
			
 
				-		return err;
			
 
				+		goto cleanup;
			
 
				 
			
 
				 	if (initialization_required) {
			
 
				 		/* PLL configuration is required */
			
 
				 		err = si5341_initialize_pll(data);
			
 
				 		if (err < 0)
			
 
				-			return err;
			
 
				+			goto cleanup;
			
 
				 	}
			
 
				 
			
 
				 	/* Register the PLL */
			
@@ -1529,7 +1676,7 @@ static int si5341_probe(struct i2c_client *client,
 
				 	err = devm_clk_hw_register(&client->dev, &data->hw);
			
 
				 	if (err) {
			
 
				 		dev_err(&client->dev, "clock registration failed\n");
			
 
				-		return err;
			
 
				+		goto cleanup;
			
 
				 	}
			
 
				 
			
 
				 	init.num_parents = 1;
			
@@ -1538,6 +1685,10 @@ static int si5341_probe(struct i2c_client *client,
 
				 	for (i = 0; i < data->num_synth; ++i) {
			
 
				 		synth_clock_names[i] = devm_kasprintf(&client->dev, GFP_KERNEL,
			
 
				 				"%s.N%u", client->dev.of_node->name, i);
			
 
				+		if (!synth_clock_names[i]) {
			
 
				+			err = -ENOMEM;
			
 
				+			goto free_clk_names;
			
 
				+		}
			
 
				 		init.name = synth_clock_names[i];
			
 
				 		data->synth[i].index = i;
			
 
				 		data->synth[i].data = data;
			
@@ -1546,6 +1697,7 @@ static int si5341_probe(struct i2c_client *client,
 
				 		if (err) {
			
 
				 			dev_err(&client->dev,
			
 
				 				"synth N%u registration failed\n", i);
			
 
				+			goto free_clk_names;
			
 
				 		}
			
 
				 	}
			
 
				 
			
@@ -1555,6 +1707,10 @@ static int si5341_probe(struct i2c_client *client,
 
				 	for (i = 0; i < data->num_outputs; ++i) {
			
 
				 		init.name = kasprintf(GFP_KERNEL, "%s.%d",
			
 
				 			client->dev.of_node->name, i);
			
 
				+		if (!init.name) {
			
 
				+			err = -ENOMEM;
			
 
				+			goto free_clk_names;
			
 
				+		}
			
 
				 		init.flags = config[i].synth_master ? CLK_SET_RATE_PARENT : 0;
			
 
				 		data->clk[i].index = i;
			
 
				 		data->clk[i].data = data;
			
@@ -1566,13 +1722,17 @@ static int si5341_probe(struct i2c_client *client,
 
				 			regmap_write(data->regmap,
			
 
				 				SI5341_OUT_CM(&data->clk[i]),
			
 
				 				config[i].out_cm_ampl_bits);
			
 
				+			regmap_update_bits(data->regmap,
			
 
				+				SI5341_OUT_MUX_SEL(&data->clk[i]),
			
 
				+				SI5341_OUT_MUX_VDD_SEL_MASK,
			
 
				+				config[i].vdd_sel_bits);
			
 
				 		}
			
 
				 		err = devm_clk_hw_register(&client->dev, &data->clk[i].hw);
			
 
				 		kfree(init.name); /* clock framework made a copy of the name */
			
 
				 		if (err) {
			
 
				 			dev_err(&client->dev,
			
 
				 				"output %u registration failed\n", i);
			
 
				-			return err;
			
 
				+			goto free_clk_names;
			
 
				 		}
			
 
				 		if (config[i].always_on)
			
 
				 			clk_prepare(data->clk[i].hw.clk);
			
@@ -1582,7 +1742,7 @@ static int si5341_probe(struct i2c_client *client,
 
				 			data);
			
 
				 	if (err) {
			
 
				 		dev_err(&client->dev, "unable to add clk provider\n");
			
 
				-		return err;
			
 
				+		goto free_clk_names;
			
 
				 	}
			
 
				 
			
 
				 	if (initialization_required) {
			
@@ -1590,11 +1750,11 @@ static int si5341_probe(struct i2c_client *client,
 
				 		regcache_cache_only(data->regmap, false);
			
 
				 		err = regcache_sync(data->regmap);
			
 
				 		if (err < 0)
			
 
				-			return err;
			
 
				+			goto free_clk_names;
			
 
				 
			
 
				 		err = si5341_finalize_defaults(data);
			
 
				 		if (err < 0)
			
 
				-			return err;
			
 
				+			goto free_clk_names;
			
 
				 	}
			
 
				 
			
 
				 	/* wait for device to report input clock present and PLL lock */
			
@@ -1603,20 +1763,47 @@ static int si5341_probe(struct i2c_client *client,
 
				 	       10000, 250000);
			
 
				 	if (err) {
			
 
				 		dev_err(&client->dev, "Error waiting for input clock or PLL lock\n");
			
 
				-		return err;
			
 
				+		goto free_clk_names;
			
 
				 	}
			
 
				 
			
 
				 	/* clear sticky alarm bits from initialization */
			
 
				 	err = regmap_write(data->regmap, SI5341_STATUS_STICKY, 0);
			
 
				 	if (err) {
			
 
				 		dev_err(&client->dev, "unable to clear sticky status\n");
			
 
				-		return err;
			
 
				+		goto free_clk_names;
			
 
				 	}
			
 
				 
			
 
				+	err = sysfs_create_files(&client->dev.kobj, si5341_attributes);
			
 
				+	if (err)
			
 
				+		dev_err(&client->dev, "unable to create sysfs files\n");
			
 
				+
			
 
				+free_clk_names:
			
 
				 	/* Free the names, clk framework makes copies */
			
 
				 	for (i = 0; i < data->num_synth; ++i)
			
 
				 		 devm_kfree(&client->dev, (void *)synth_clock_names[i]);
			
 
				 
			
 
				+cleanup:
			
 
				+	if (err) {
			
 
				+		for (i = 0; i < SI5341_MAX_NUM_OUTPUTS; ++i) {
			
 
				+			if (data->clk[i].vddo_reg)
			
 
				+				regulator_disable(data->clk[i].vddo_reg);
			
 
				+		}
			
 
				+	}
			
 
				+	return err;
			
 
				+}
			
 
				+
			
 
				+static int si5341_remove(struct i2c_client *client)
			
 
				+{
			
 
				+	struct clk_si5341 *data = i2c_get_clientdata(client);
			
 
				+	int i;
			
 
				+
			
 
				+	sysfs_remove_files(&client->dev.kobj, si5341_attributes);
			
 
				+
			
 
				+	for (i = 0; i < SI5341_MAX_NUM_OUTPUTS; ++i) {
			
 
				+		if (data->clk[i].vddo_reg)
			
 
				+			regulator_disable(data->clk[i].vddo_reg);
			
 
				+	}
			
 
				+
			
 
				 	return 0;
			
 
				 }
			
 
				 
			
@@ -1646,6 +1833,7 @@ static struct i2c_driver si5341_driver = {
 
				 		.of_match_table = clk_si5341_of_match,
			
 
				 	},
			
 
				 	.probe		= si5341_probe,
			
 
				+	.remove		= si5341_remove,
			
 
				 	.id_table	= si5341_id,
			
 
				 };
			
 
				 module_i2c_driver(si5341_driver);
			
--- a/drivers/clk/clk-versaclock5.c
+++ b/drivers/clk/clk-versaclock5.c
@@ -906,6 +906,11 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
				 	}
			
 
				 
			
 
				 	init.name = kasprintf(GFP_KERNEL, "%pOFn.mux", client->dev.of_node);
			
 
				+	if (!init.name) {
			
 
				+		ret = -ENOMEM;
			
 
				+		goto err_clk;
			
 
				+	}
			
 
				+
			
 
				 	init.ops = &vc5_mux_ops;
			
 
				 	init.flags = 0;
			
 
				 	init.parent_names = parent_names;
			
@@ -920,6 +925,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
				 		memset(&init, 0, sizeof(init));
			
 
				 		init.name = kasprintf(GFP_KERNEL, "%pOFn.dbl",
			
 
				 				      client->dev.of_node);
			
 
				+		if (!init.name) {
			
 
				+			ret = -ENOMEM;
			
 
				+			goto err_clk;
			
 
				+		}
			
 
				 		init.ops = &vc5_dbl_ops;
			
 
				 		init.flags = CLK_SET_RATE_PARENT;
			
 
				 		init.parent_names = parent_names;
			
@@ -935,6 +944,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
				 	/* Register PFD */
			
 
				 	memset(&init, 0, sizeof(init));
			
 
				 	init.name = kasprintf(GFP_KERNEL, "%pOFn.pfd", client->dev.of_node);
			
 
				+	if (!init.name) {
			
 
				+		ret = -ENOMEM;
			
 
				+		goto err_clk;
			
 
				+	}
			
 
				 	init.ops = &vc5_pfd_ops;
			
 
				 	init.flags = CLK_SET_RATE_PARENT;
			
 
				 	init.parent_names = parent_names;
			
@@ -952,6 +965,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
				 	/* Register PLL */
			
 
				 	memset(&init, 0, sizeof(init));
			
 
				 	init.name = kasprintf(GFP_KERNEL, "%pOFn.pll", client->dev.of_node);
			
 
				+	if (!init.name) {
			
 
				+		ret = -ENOMEM;
			
 
				+		goto err_clk;
			
 
				+	}
			
 
				 	init.ops = &vc5_pll_ops;
			
 
				 	init.flags = CLK_SET_RATE_PARENT;
			
 
				 	init.parent_names = parent_names;
			
@@ -971,6 +988,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
				 		memset(&init, 0, sizeof(init));
			
 
				 		init.name = kasprintf(GFP_KERNEL, "%pOFn.fod%d",
			
 
				 				      client->dev.of_node, idx);
			
 
				+		if (!init.name) {
			
 
				+			ret = -ENOMEM;
			
 
				+			goto err_clk;
			
 
				+		}
			
 
				 		init.ops = &vc5_fod_ops;
			
 
				 		init.flags = CLK_SET_RATE_PARENT;
			
 
				 		init.parent_names = parent_names;
			
@@ -989,6 +1010,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
				 	memset(&init, 0, sizeof(init));
			
 
				 	init.name = kasprintf(GFP_KERNEL, "%pOFn.out0_sel_i2cb",
			
 
				 			      client->dev.of_node);
			
 
				+	if (!init.name) {
			
 
				+		ret = -ENOMEM;
			
 
				+		goto err_clk;
			
 
				+	}
			
 
				 	init.ops = &vc5_clk_out_ops;
			
 
				 	init.flags = CLK_SET_RATE_PARENT;
			
 
				 	init.parent_names = parent_names;
			
@@ -1015,6 +1040,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
				 		memset(&init, 0, sizeof(init));
			
 
				 		init.name = kasprintf(GFP_KERNEL, "%pOFn.out%d",
			
 
				 				      client->dev.of_node, idx + 1);
			
 
				+		if (!init.name) {
			
 
				+			ret = -ENOMEM;
			
 
				+			goto err_clk;
			
 
				+		}
			
 
				 		init.ops = &vc5_clk_out_ops;
			
 
				 		init.flags = CLK_SET_RATE_PARENT;
			
 
				 		init.parent_names = parent_names;
			
--- a/drivers/clk/imx/clk-imx8mn.c
+++ b/drivers/clk/imx/clk-imx8mn.c
@@ -291,7 +291,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)
 
				 	void __iomem *base;
			
 
				 	int ret;
			
 
				 
			
 
				-	clk_hw_data = kzalloc(struct_size(clk_hw_data, hws,
			
 
				+	clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws,
			
 
				 					  IMX8MN_CLK_END), GFP_KERNEL);
			
 
				 	if (WARN_ON(!clk_hw_data))
			
 
				 		return -ENOMEM;
			
@@ -308,10 +308,10 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)
 
				 	hws[IMX8MN_CLK_EXT4] = imx_obtain_fixed_clk_hw(np, "clk_ext4");
			
 
				 
			
 
				 	np = of_find_compatible_node(NULL, NULL, "fsl,imx8mn-anatop");
			
 
				-	base = of_iomap(np, 0);
			
 
				+	base = devm_of_iomap(dev, np, 0, NULL);
			
 
				 	of_node_put(np);
			
 
				-	if (WARN_ON(!base)) {
			
 
				-		ret = -ENOMEM;
			
 
				+	if (WARN_ON(IS_ERR(base))) {
			
 
				+		ret = PTR_ERR(base);
			
 
				 		goto unregister_hws;
			
 
				 	}
			
 
				 
			
--- a/drivers/clk/imx/clk-imx8mp.c
+++ b/drivers/clk/imx/clk-imx8mp.c
@@ -425,25 +425,22 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
 
				 	struct device *dev = &pdev->dev;
			
 
				 	struct device_node *np = dev->of_node;
			
 
				 	void __iomem *anatop_base, *ccm_base;
			
 
				+	int err;
			
 
				 
			
 
				 	np = of_find_compatible_node(NULL, NULL, "fsl,imx8mp-anatop");
			
 
				-	anatop_base = of_iomap(np, 0);
			
 
				+	anatop_base = devm_of_iomap(dev, np, 0, NULL);
			
 
				 	of_node_put(np);
			
 
				-	if (WARN_ON(!anatop_base))
			
 
				-		return -ENOMEM;
			
 
				+	if (WARN_ON(IS_ERR(anatop_base)))
			
 
				+		return PTR_ERR(anatop_base);
			
 
				 
			
 
				 	np = dev->of_node;
			
 
				 	ccm_base = devm_platform_ioremap_resource(pdev, 0);
			
 
				-	if (WARN_ON(IS_ERR(ccm_base))) {
			
 
				-		iounmap(anatop_base);
			
 
				+	if (WARN_ON(IS_ERR(ccm_base)))
			
 
				 		return PTR_ERR(ccm_base);
			
 
				-	}
			
 
				 
			
 
				-	clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, IMX8MP_CLK_END), GFP_KERNEL);
			
 
				-	if (WARN_ON(!clk_hw_data)) {
			
 
				-		iounmap(anatop_base);
			
 
				+	clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, IMX8MP_CLK_END), GFP_KERNEL);
			
 
				+	if (WARN_ON(!clk_hw_data))
			
 
				 		return -ENOMEM;
			
 
				-	}
			
 
				 
			
 
				 	clk_hw_data->num = IMX8MP_CLK_END;
			
 
				 	hws = clk_hw_data->hws;
			
@@ -743,7 +740,12 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
 
				 
			
 
				 	imx_check_clk_hws(hws, IMX8MP_CLK_END);
			
 
				 
			
 
				-	of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data);
			
 
				+	err = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data);
			
 
				+	if (err < 0) {
			
 
				+		dev_err(dev, "failed to register hws for i.MX8MP\n");
			
 
				+		imx_unregister_hw_clocks(hws, IMX8MP_CLK_END);
			
 
				+		return err;
			
 
				+	}
			
 
				 
			
 
				 	imx_register_uart_clocks(4);
			
 
				 
			
--- a/drivers/clk/keystone/sci-clk.c
+++ b/drivers/clk/keystone/sci-clk.c
@@ -302,6 +302,8 @@ static int _sci_clk_build(struct sci_clk_provider *provider,
 
				 
			
 
				 	name = kasprintf(GFP_KERNEL, "clk:%d:%d", sci_clk->dev_id,
			
 
				 			 sci_clk->clk_id);
			
 
				+	if (!name)
			
 
				+		return -ENOMEM;
			
 
				 
			
 
				 	init.name = name;