Commit 47d65738 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'parisc-for-6.14-rc1' of... 

Merge tag 'parisc-for-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc architecture updates from Helge Deller:

 - Temporarily disable jump label support to avoid kernel crash with
   32-bit kernel

 - Add vdso linker script to 'targets' instead of extra-y

 - Remove parisc versions of memcpy_toio and memset_io

* tag 'parisc-for-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Temporarily disable jump label support
  parisc: add vdso linker script to 'targets' instead of extra-y
  parisc: Remove memcpy_toio and memset_io
parents ac0761d8 3599bae4

arch/parisc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ config PARISC 
	select HAVE_ARCH_MMAP_RND_BITS

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_HASH

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_JUMP_LABEL_RELATIVE

	# select HAVE_ARCH_JUMP_LABEL

	# select HAVE_ARCH_JUMP_LABEL_RELATIVE

	select HAVE_ARCH_KFENCE

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

arch/parisc/include/asm/io.h

+0 −4
Original line number Diff line number Diff line
@@ -135,12 +135,8 @@ static inline void gsc_writeq(unsigned long long val, unsigned long addr) 


#define pci_iounmap			pci_iounmap



void memset_io(volatile void __iomem *addr, unsigned char val, int count);

void memcpy_fromio(void *dst, const volatile void __iomem *src, int count);

void memcpy_toio(volatile void __iomem *dst, const void *src, int count);

#define memset_io memset_io

#define memcpy_fromio memcpy_fromio

#define memcpy_toio memcpy_toio



/* Port-space IO */

arch/parisc/kernel/parisc_ksyms.c

+0 −2
Original line number Diff line number Diff line
@@ -43,9 +43,7 @@ EXPORT_SYMBOL($global$); 
#endif



#include <asm/io.h>

EXPORT_SYMBOL(memcpy_toio);

EXPORT_SYMBOL(memcpy_fromio);

EXPORT_SYMBOL(memset_io);



extern void $$divI(void);

extern void $$divU(void);

arch/parisc/kernel/vdso32/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ KBUILD_CFLAGS += -DBUILD_VDSO -DDISABLE_BRANCH_PROFILING 
VDSO_LIBGCC := $(shell $(CROSS32CC) -print-libgcc-file-name)



obj-y += vdso32_wrapper.o

extra-y += vdso32.lds

targets += vdso32.lds

CPPFLAGS_vdso32.lds += -P -C  #  -U$(ARCH)



$(obj)/vdso32_wrapper.o : $(obj)/vdso32.so FORCE

arch/parisc/kernel/vdso64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ KBUILD_CFLAGS += -DBUILD_VDSO -DDISABLE_BRANCH_PROFILING 
VDSO_LIBGCC := $(shell $(CC) -print-libgcc-file-name)



obj-y += vdso64_wrapper.o

extra-y += vdso64.lds

targets += vdso64.lds

CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)



$(obj)/vdso64_wrapper.o : $(obj)/vdso64.so FORCE