tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'arc-6.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

Pull ARC fixes from Vineet Gupta:

- Sundry build and misc fixes

* tag 'arc-6.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: build: Try to guess GCC variant of cross compiler
ARC: bpf: Correct conditional check in 'check_jmp_32'
ARC: dts: Replace deprecated snps,nr-gpios property for snps,dw-apb-gpio-port devices
ARC: build: Use __force to suppress per-CPU cmpxchg warnings
ARC: fix reference of dependency for PAE40 config
ARC: build: disallow invalid PAE40 + 4K page config
arc: rename aux.h to arc_aux.h

Linus Torvalds 42a19aa1 7031a38a

+19 -19
+2 -2
arch/arc/Kconfig
··· 297 297 config ARC_PAGE_SIZE_4K 298 298 bool "4KB" 299 299 select HAVE_PAGE_SIZE_4KB 300 - depends on ARC_MMU_V3 || ARC_MMU_V4 301 300 302 301 endchoice 303 302 ··· 473 474 474 475 config ARC_HAS_PAE40 475 476 bool "Support for the 40-bit Physical Address Extension" 476 - depends on ISA_ARCV2 477 + depends on ARC_MMU_V4 478 + depends on !ARC_PAGE_SIZE_4K 477 479 select HIGHMEM 478 480 select PHYS_ADDR_T_64BIT 479 481 help
+1 -1
arch/arc/Makefile
··· 6 6 KBUILD_DEFCONFIG := haps_hs_smp_defconfig 7 7 8 8 ifeq ($(CROSS_COMPILE),) 9 - CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux-) 9 + CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux- arc-linux-gnu-) 10 10 endif 11 11 12 12 cflags-y += -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__
+1 -1
arch/arc/boot/dts/axc001.dtsi
··· 54 54 compatible = "snps,dw-apb-gpio-port"; 55 55 gpio-controller; 56 56 #gpio-cells = <2>; 57 - snps,nr-gpios = <30>; 57 + ngpios = <30>; 58 58 reg = <0>; 59 59 interrupt-controller; 60 60 #interrupt-cells = <2>;
+1 -1
arch/arc/boot/dts/axc003.dtsi
··· 62 62 compatible = "snps,dw-apb-gpio-port"; 63 63 gpio-controller; 64 64 #gpio-cells = <2>; 65 - snps,nr-gpios = <30>; 65 + ngpios = <30>; 66 66 reg = <0>; 67 67 interrupt-controller; 68 68 #interrupt-cells = <2>;
+1 -1
arch/arc/boot/dts/axc003_idu.dtsi
··· 69 69 compatible = "snps,dw-apb-gpio-port"; 70 70 gpio-controller; 71 71 #gpio-cells = <2>; 72 - snps,nr-gpios = <30>; 72 + ngpios = <30>; 73 73 reg = <0>; 74 74 interrupt-controller; 75 75 #interrupt-cells = <2>;
+6 -6
arch/arc/boot/dts/axs10x_mb.dtsi
··· 250 250 compatible = "snps,dw-apb-gpio-port"; 251 251 gpio-controller; 252 252 #gpio-cells = <2>; 253 - snps,nr-gpios = <32>; 253 + ngpios = <32>; 254 254 reg = <0>; 255 255 }; 256 256 ··· 258 258 compatible = "snps,dw-apb-gpio-port"; 259 259 gpio-controller; 260 260 #gpio-cells = <2>; 261 - snps,nr-gpios = <8>; 261 + ngpios = <8>; 262 262 reg = <1>; 263 263 }; 264 264 ··· 266 266 compatible = "snps,dw-apb-gpio-port"; 267 267 gpio-controller; 268 268 #gpio-cells = <2>; 269 - snps,nr-gpios = <8>; 269 + ngpios = <8>; 270 270 reg = <2>; 271 271 }; 272 272 }; ··· 281 281 compatible = "snps,dw-apb-gpio-port"; 282 282 gpio-controller; 283 283 #gpio-cells = <2>; 284 - snps,nr-gpios = <30>; 284 + ngpios = <30>; 285 285 reg = <0>; 286 286 }; 287 287 ··· 289 289 compatible = "snps,dw-apb-gpio-port"; 290 290 gpio-controller; 291 291 #gpio-cells = <2>; 292 - snps,nr-gpios = <10>; 292 + ngpios = <10>; 293 293 reg = <1>; 294 294 }; 295 295 ··· 297 297 compatible = "snps,dw-apb-gpio-port"; 298 298 gpio-controller; 299 299 #gpio-cells = <2>; 300 - snps,nr-gpios = <8>; 300 + ngpios = <8>; 301 301 reg = <2>; 302 302 }; 303 303 };
+1 -1
arch/arc/boot/dts/hsdk.dts
··· 308 308 compatible = "snps,dw-apb-gpio-port"; 309 309 gpio-controller; 310 310 #gpio-cells = <2>; 311 - snps,nr-gpios = <24>; 311 + ngpios = <24>; 312 312 reg = <0>; 313 313 }; 314 314 };
+1 -1
arch/arc/include/asm/arcregs.h
··· 146 146 147 147 #ifndef __ASSEMBLY__ 148 148 149 - #include <soc/arc/aux.h> 149 + #include <soc/arc/arc_aux.h> 150 150 151 151 /* Helpers */ 152 152 #define TO_KB(bytes) ((bytes) >> 10)
+1 -1
arch/arc/include/asm/cmpxchg.h
··· 48 48 \ 49 49 switch(sizeof((_p_))) { \ 50 50 case 1: \ 51 - _prev_ = (__typeof__(*(ptr)))cmpxchg_emu_u8((volatile u8 *)_p_, (uintptr_t)_o_, (uintptr_t)_n_); \ 51 + _prev_ = (__typeof__(*(ptr)))cmpxchg_emu_u8((volatile u8 *__force)_p_, (uintptr_t)_o_, (uintptr_t)_n_); \ 52 52 break; \ 53 53 case 4: \ 54 54 _prev_ = __cmpxchg(_p_, _o_, _n_); \
+1 -1
arch/arc/include/asm/mmu-arcv2.h
··· 9 9 #ifndef _ASM_ARC_MMU_ARCV2_H 10 10 #define _ASM_ARC_MMU_ARCV2_H 11 11 12 - #include <soc/arc/aux.h> 12 + #include <soc/arc/arc_aux.h> 13 13 14 14 /* 15 15 * TLB Management regs
+1 -1
arch/arc/net/bpf_jit_arcv2.c
··· 2916 2916 addendum = (cond == ARC_CC_AL) ? 0 : INSN_len_normal; 2917 2917 disp = get_displacement(curr_off + addendum, targ_off); 2918 2918 2919 - if (ARC_CC_AL) 2919 + if (cond == ARC_CC_AL) 2920 2920 return is_valid_far_disp(disp); 2921 2921 else 2922 2922 return is_valid_near_disp(disp);
include/soc/arc/aux.h include/soc/arc/arc_aux.h
+1 -1
include/soc/arc/mcip.h
··· 8 8 #ifndef __SOC_ARC_MCIP_H 9 9 #define __SOC_ARC_MCIP_H 10 10 11 - #include <soc/arc/aux.h> 11 + #include <soc/arc/arc_aux.h> 12 12 13 13 #define ARC_REG_MCIP_BCR 0x0d0 14 14 #define ARC_REG_MCIP_IDU_BCR 0x0D5
+1 -1
include/soc/arc/timers.h
··· 6 6 #ifndef __SOC_ARC_TIMERS_H 7 7 #define __SOC_ARC_TIMERS_H 8 8 9 - #include <soc/arc/aux.h> 9 + #include <soc/arc/arc_aux.h> 10 10 11 11 /* Timer related Aux registers */ 12 12 #define ARC_REG_TIMER0_LIMIT 0x23 /* timer 0 limit */