Commit 60c828cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-hexagon-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/bcain/linux 

Pull hexagon updates from Brian Cain:

 - Move kernel prototypes out of uapi header to internal header

 - Fix to address an unbalanced spinlock

 - Miscellaneous patches to fix static checks

 - Update bcain@quicinc.com->brian.cain@oss.qualcomm.com

* tag 'for-linus-hexagon-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/bcain/linux:
  MAINTAINERS: Update my email address
  hexagon: Fix unbalanced spinlock in die()
  hexagon: Fix warning comparing pointer to 0
  hexagon: Move kernel prototypes out of uapi/asm/setup.h header
  hexagon: time: Remove redundant null check for resource
  hexagon: fix using plain integer as NULL pointer warning in cmpxchg
parents 04a3389b 84d78214

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com> 
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>

Brendan Higgins <brendan.higgins@linux.dev> <brendanhiggins@google.com>

Brian Avery <b.avery@hp.com>

Brian Cain <bcain@kernel.org> <brian.cain@oss.qualcomm.com>

Brian Cain <bcain@kernel.org> <bcain@quicinc.com>

Brian King <brking@us.ibm.com>

Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>

Bryan Tan <bryan-bt.tan@broadcom.com> <bryantan@vmware.com>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -19453,7 +19453,7 @@ F: drivers/misc/fastrpc.c 
F:	include/uapi/misc/fastrpc.h









QUALCOMM HEXAGON ARCHITECTURE









M:	Brian Cain <bcain@quicinc.com>









M:	Brian Cain <brian.cain@oss.qualcomm.com>









L:	linux-hexagon@vger.kernel.org









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bcain/linux.git

























arch/hexagon/include/asm/cmpxchg.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -56,7 +56,7 @@ __arch_xchg(unsigned long x, volatile void *ptr, int size)







	__typeof__(ptr) __ptr = (ptr);				\









	__typeof__(*(ptr)) __old = (old);			\









	__typeof__(*(ptr)) __new = (new);			\









	__typeof__(*(ptr)) __oldval = 0;			\









	__typeof__(*(ptr)) __oldval = (__typeof__(*(ptr))) 0;	\









								\









	asm volatile(						\









		"1:	%0 = memw_locked(%1);\n"		\
































arch/hexagon/include/asm/setup.h
0 → 100644



+20
−0






























Original line number
Diff line number
Diff line









/* SPDX-License-Identifier: GPL-2.0-only */









/*









 * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.









 *









 * This program is free software; you can redistribute it and/or modify









 * it under the terms of the GNU General Public License version 2 and









 * only version 2 as published by the Free Software Foundation.









 */



















#ifndef _ASM_HEXAGON_SETUP_H









#define _ASM_HEXAGON_SETUP_H



















#include <linux/init.h>









#include <uapi/asm/setup.h>



















extern char external_cmdline_buffer;



















void __init setup_arch_memory(void);



















#endif
























arch/hexagon/include/uapi/asm/setup.h



+2
−12






























Original line number
Diff line number
Diff line







@@ -17,19 +17,9 @@







 * 02110-1301, USA.









 */



















#ifndef _ASM_SETUP_H









#define _ASM_SETUP_H



















#ifdef __KERNEL__









#include <linux/init.h>









#else









#define __init









#endif









#ifndef _UAPI_ASM_HEXAGON_SETUP_H









#define _UAPI_ASM_HEXAGON_SETUP_H



















#include <asm-generic/setup.h>



















extern char external_cmdline_buffer;



















void __init setup_arch_memory(void);



















#endif