Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5f2bd47 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc updates from Helge Deller:
 "The major change in this patchset is the new system call table
  generation support from Firoz Khan"

* 'parisc-4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: syscalls: ignore nfsservctl for other architectures
  parisc: generate uapi header and system call table files
  parisc: add system call table generation support
  parisc: remove __NR_Linux from uapi header file.
  parisc: add __NR_syscalls along with __NR_Linux_syscalls
  parisc: move __IGNORE* entries to non uapi header
  parisc: Fix HP SDC hpa address output
  parisc: Fix serio address output
  parisc: Split out alternative live patching code
parents 89261c57 930e1299

arch/parisc/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -163,3 +163,6 @@ define archhelp 
	@echo  '		  copy to $$(INSTALL_PATH)'

	@echo  '  zinstall	- Install compressed vmlinuz kernel'

endef



archheaders:

	$(Q)$(MAKE) $(build)=arch/parisc/kernel/syscalls all

arch/parisc/include/asm/Kbuild

+3 −0
Original line number Diff line number Diff line 
generated-y += syscall_table_32.h

generated-y += syscall_table_64.h

generated-y += syscall_table_c32.h

generic-y += barrier.h

generic-y += current.h

generic-y += device.h

arch/parisc/include/asm/alternative.h

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef __ASM_PARISC_ALTERNATIVE_H

#define __ASM_PARISC_ALTERNATIVE_H



#define ALT_COND_ALWAYS		0x80	/* always replace instruction */

#define ALT_COND_NO_SMP		0x01	/* when running UP instead of SMP */

#define ALT_COND_NO_DCACHE	0x02	/* if system has no d-cache  */

#define ALT_COND_NO_ICACHE	0x04	/* if system has no i-cache  */
@@ -26,6 +27,9 @@ struct alt_instr { 
};



void set_kernel_text_rw(int enable_read_write);

void apply_alternatives_all(void);

void apply_alternatives(struct alt_instr *start, struct alt_instr *end,

	const char *module_name);



/* Alternative SMP implementation. */

#define ALTERNATIVE(cond, replacement)		"!0:"	\

arch/parisc/include/asm/unistd.h

+8 −0
Original line number Diff line number Diff line
@@ -4,10 +4,18 @@ 


#include <uapi/asm/unistd.h>



#define __NR_Linux_syscalls	__NR_syscalls



#ifndef __ASSEMBLY__



#define SYS_ify(syscall_name)   __NR_##syscall_name



#define __IGNORE_select			/* newselect */

#define __IGNORE_fadvise64		/* fadvise64_64 */

#define __IGNORE_pkey_mprotect

#define __IGNORE_pkey_alloc

#define __IGNORE_pkey_free



#ifndef ASM_LINE_SEP

# define ASM_LINE_SEP ;

#endif

arch/parisc/include/uapi/asm/Kbuild

+2 −0
Original line number Diff line number Diff line 
# UAPI Header export list

include include/uapi/asm-generic/Kbuild.asm



generated-y += unistd_32.h

generated-y += unistd_64.h

generic-y += auxvec.h

generic-y += bpf_perf_event.h

generic-y += kvm_para.h