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

Pull parisc architecture fixes from Helge Deller:

- enable ARCH_HAS_STRICT_MODULE_RWX to prevent a boot crash on c8000
machines

- flush all mappings of a shared anonymous page on PA8800/8900 machines
via flushing the whole data cache. This may slow down such machines
but makes sure that the cache is consistent

- Fix duplicate definition build error regarding fb_is_primary_device()

* tag 'for-5.19/parisc-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Enable ARCH_HAS_STRICT_MODULE_RWX
parisc: Fix flush_anon_page on PA8800/PA8900
parisc: align '*' in comment in math-emu code
parisc/stifb: Fix fb_is_primary_device() only available with CONFIG_FB_STI

Linus Torvalds c0c6a7bd e963d685

+9 -3
+1
arch/parisc/Kconfig
··· 10 10 select ARCH_WANT_FRAME_POINTERS 11 11 select ARCH_HAS_ELF_RANDOMIZE 12 12 select ARCH_HAS_STRICT_KERNEL_RWX 13 + select ARCH_HAS_STRICT_MODULE_RWX 13 14 select ARCH_HAS_UBSAN_SANITIZE_ALL 14 15 select ARCH_HAS_PTE_SPECIAL 15 16 select ARCH_NO_SG_CHAIN
+1 -1
arch/parisc/include/asm/fb.h
··· 12 12 pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE; 13 13 } 14 14 15 - #if defined(CONFIG_STI_CONSOLE) || defined(CONFIG_FB_STI) 15 + #if defined(CONFIG_FB_STI) 16 16 int fb_is_primary_device(struct fb_info *info); 17 17 #else 18 18 static inline int fb_is_primary_device(struct fb_info *info)
+4 -1
arch/parisc/kernel/cache.c
··· 722 722 return; 723 723 724 724 if (parisc_requires_coherency()) { 725 - flush_user_cache_page(vma, vmaddr); 725 + if (vma->vm_flags & VM_SHARED) 726 + flush_data_cache(); 727 + else 728 + flush_user_cache_page(vma, vmaddr); 726 729 return; 727 730 } 728 731
+1 -1
arch/parisc/math-emu/decode_exc.c
··· 102 102 * that happen. Want to keep this overhead low, but still provide 103 103 * some information to the customer. All exits from this routine 104 104 * need to restore Fpu_register[0] 105 - */ 105 + */ 106 106 107 107 bflags=(Fpu_register[0] & 0xf8000000); 108 108 Fpu_register[0] &= 0x07ffffff;
+2
drivers/video/console/sticore.c
··· 1148 1148 return ret; 1149 1149 } 1150 1150 1151 + #if defined(CONFIG_FB_STI) 1151 1152 /* check if given fb_info is the primary device */ 1152 1153 int fb_is_primary_device(struct fb_info *info) 1153 1154 { ··· 1164 1163 return (sti->info == info); 1165 1164 } 1166 1165 EXPORT_SYMBOL(fb_is_primary_device); 1166 + #endif 1167 1167 1168 1168 MODULE_AUTHOR("Philipp Rumpf, Helge Deller, Thomas Bogendoerfer"); 1169 1169 MODULE_DESCRIPTION("Core STI driver for HP's NGLE series graphics cards in HP PARISC machines");