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 'parisc-for-6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc architecture fixes from Helge Deller:

- fix unaligned memory accesses when calling BPF functions

- adjust memory size constants to fix possible DMA corruptions

* tag 'parisc-for-6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: fix a possible DMA corruption
parisc: fix unaligned accesses in BPF

Linus Torvalds 1dd950f2 b6547e54

+12 -2
+1
arch/parisc/Kconfig
··· 20 20 select ARCH_SUPPORTS_HUGETLBFS if PA20 21 21 select ARCH_SUPPORTS_MEMORY_FAILURE 22 22 select ARCH_STACKWALK 23 + select ARCH_HAS_CACHE_LINE_SIZE 23 24 select ARCH_HAS_DEBUG_VM_PGTABLE 24 25 select HAVE_RELIABLE_STACKTRACE 25 26 select DMA_OPS
+10 -1
arch/parisc/include/asm/cache.h
··· 20 20 21 21 #define SMP_CACHE_BYTES L1_CACHE_BYTES 22 22 23 - #define ARCH_DMA_MINALIGN L1_CACHE_BYTES 23 + #ifdef CONFIG_PA20 24 + #define ARCH_DMA_MINALIGN 128 25 + #else 26 + #define ARCH_DMA_MINALIGN 32 27 + #endif 28 + #define ARCH_KMALLOC_MINALIGN 16 /* ldcw requires 16-byte alignment */ 29 + 30 + #define arch_slab_minalign() ((unsigned)dcache_stride) 31 + #define cache_line_size() dcache_stride 32 + #define dma_get_cache_alignment cache_line_size 24 33 25 34 #define __read_mostly __section(".data..read_mostly") 26 35
+1 -1
arch/parisc/net/bpf_jit_core.c
··· 114 114 jit_data->header = 115 115 bpf_jit_binary_alloc(prog_size + extable_size, 116 116 &jit_data->image, 117 - sizeof(u32), 117 + sizeof(long), 118 118 bpf_fill_ill_insns); 119 119 if (!jit_data->header) { 120 120 prog = orig_prog;