Merge "Merge android-4.19.27 (36d178b) into msm-4.19" (e2739dee) · Commits · e / devices / android_kernel_oneplus_sm7250

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 19
		SUBLEVEL = 26
		SUBLEVEL = 27
		EXTRAVERSION =
		NAME = "People's Front"

arch/arc/include/asm/bitops.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -340,7 +340,7 @@ static inline __attribute__ ((const)) int __fls(unsigned long x)
		/*
		* __ffs: Similar to ffs, but zero based (0-31)
		*/
		static inline __attribute__ ((const)) int __ffs(unsigned long word)
		static inline __attribute__ ((const)) unsigned long __ffs(unsigned long word)
		{
		if (!word)
		return word;
		@@ -400,9 +400,9 @@ static inline __attribute__ ((const)) int ffs(unsigned long x)
		/*
		* __ffs: Similar to ffs, but zero based (0-31)
		*/
		static inline __attribute__ ((const)) int __ffs(unsigned long x)
		static inline __attribute__ ((const)) unsigned long __ffs(unsigned long x)
		{
		int n;
		unsigned long n;

		asm volatile(
		" ffs.f %0, %1 \n" /* 0:31; 31(Z) if src 0 */

arch/arc/kernel/troubleshoot.c

+12 −14

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@
		#include <asm/arcregs.h>
		#include <asm/irqflags.h>

		#define ARC_PATH_MAX 256

		/*
		* Common routine to print scratch regs (r0-r12) or callee regs (r13-r25)
		* -Prints 3 regs per line and a CR.
		@@ -58,11 +60,12 @@ static void show_callee_regs(struct callee_regs *cregs)
		print_reg_file(&(cregs->r13), 13);
		}

		static void print_task_path_n_nm(struct task_struct tsk, char buf)
		static void print_task_path_n_nm(struct task_struct *tsk)
		{
		char *path_nm = NULL;
		struct mm_struct *mm;
		struct file *exe_file;
		char buf[ARC_PATH_MAX];

		mm = get_task_mm(tsk);
		if (!mm)
		@@ -72,7 +75,7 @@ static void print_task_path_n_nm(struct task_struct tsk, char buf)
		mmput(mm);

		if (exe_file) {
		path_nm = file_path(exe_file, buf, 255);
		path_nm = file_path(exe_file, buf, ARC_PATH_MAX-1);
		fput(exe_file);
		}

		@@ -80,10 +83,9 @@ static void print_task_path_n_nm(struct task_struct tsk, char buf)
		pr_info("Path: %s\n", !IS_ERR(path_nm) ? path_nm : "?");
		}

		static void show_faulting_vma(unsigned long address, char *buf)
		static void show_faulting_vma(unsigned long address)
		{
		struct vm_area_struct *vma;
		char *nm = buf;
		struct mm_struct *active_mm = current->active_mm;

		/* can't use print_vma_addr() yet as it doesn't check for
		@@ -96,8 +98,11 @@ static void show_faulting_vma(unsigned long address, char *buf)
		* if the container VMA is not found
		*/
		if (vma && (vma->vm_start <= address)) {
		char buf[ARC_PATH_MAX];
		char *nm = "?";

		if (vma->vm_file) {
		nm = file_path(vma->vm_file, buf, PAGE_SIZE - 1);
		nm = file_path(vma->vm_file, buf, ARC_PATH_MAX-1);
		if (IS_ERR(nm))
		nm = "?";
		}
		@@ -173,13 +178,8 @@ void show_regs(struct pt_regs *regs)
		{
		struct task_struct *tsk = current;
		struct callee_regs *cregs;
		char *buf;

		buf = (char *)__get_free_page(GFP_KERNEL);
		if (!buf)
		return;

		print_task_path_n_nm(tsk, buf);
		print_task_path_n_nm(tsk);
		show_regs_print_info(KERN_INFO);

		show_ecr_verbose(regs);
		@@ -189,7 +189,7 @@ void show_regs(struct pt_regs *regs)
		(void )regs->blink, (void )regs->ret);

		if (user_mode(regs))
		show_faulting_vma(regs->ret, buf); /* faulting code, not data */
		show_faulting_vma(regs->ret); /* faulting code, not data */

		pr_info("[STAT32]: 0x%08lx", regs->status32);

		@@ -221,8 +221,6 @@ void show_regs(struct pt_regs *regs)
		cregs = (struct callee_regs *)current->thread.callee_reg;
		if (cregs)
		show_callee_regs(cregs);

		free_page((unsigned long)buf);
		}

		void show_kernel_fault_diag(const char str, struct pt_regs regs,

arch/mips/bcm63xx/dev-enet.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,8 @@ static struct platform_device bcm63xx_enet_shared_device = {

		static int shared_device_registered;

		static u64 enet_dmamask = DMA_BIT_MASK(32);

		static struct resource enet0_res[] = {
		{
		.start = -1, /* filled at runtime */
		@@ -99,6 +101,8 @@ static struct platform_device bcm63xx_enet0_device = {
		.resource = enet0_res,
		.dev = {
		.platform_data = &enet0_pd,
		.dma_mask = &enet_dmamask,
		.coherent_dma_mask = DMA_BIT_MASK(32),
		},
		};

		@@ -131,6 +135,8 @@ static struct platform_device bcm63xx_enet1_device = {
		.resource = enet1_res,
		.dev = {
		.platform_data = &enet1_pd,
		.dma_mask = &enet_dmamask,
		.coherent_dma_mask = DMA_BIT_MASK(32),
		},
		};

		@@ -157,6 +163,8 @@ static struct platform_device bcm63xx_enetsw_device = {
		.resource = enetsw_res,
		.dev = {
		.platform_data = &enetsw_pd,
		.dma_mask = &enet_dmamask,
		.coherent_dma_mask = DMA_BIT_MASK(32),
		},
		};

arch/mips/kernel/cmpxchg.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -54,10 +54,9 @@ unsigned long __xchg_small(volatile void *ptr, unsigned long val, unsigned int s
		unsigned long __cmpxchg_small(volatile void *ptr, unsigned long old,
		unsigned long new, unsigned int size)
		{
		u32 mask, old32, new32, load32;
		u32 mask, old32, new32, load32, load;
		volatile u32 *ptr32;
		unsigned int shift;
		u8 load;

		/* Check that ptr is naturally aligned */
		WARN_ON((unsigned long)ptr & (size - 1));