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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc update from David Miller:
 "Two changes:

  1) It makes no sense to execute a VTOC partition table request in the
     Sun virtual block device driver and fail to load if it doesn't
     succeed because a) we don't use the result at all and b) it won't
     succeed if there is an EFI partition on the disk, for example.

     We read the partition table via the normal means in the block layer
     anyways, so this is really completely useless, so just remove it.

     From Dwight Engen.

  2) Hook up new bpf system call"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sunvdc: don't call VD_OP_GET_VTOC
  sparc: Hook up bpf system call.
parents 9f58c62f 85b0c6e6

arch/sparc/include/uapi/asm/unistd.h

+2 −1
Original line number Diff line number Diff line
@@ -414,8 +414,9 @@ 
#define __NR_seccomp		346

#define __NR_getrandom		347

#define __NR_memfd_create	348

#define __NR_bpf		349



#define NR_syscalls		349

#define NR_syscalls		350



/* Bitmask values returned from kern_features system call.  */

#define KERN_FEATURE_MIXED_MODE_STACK	0x00000001

arch/sparc/kernel/systbls_32.S

+1 −1
Original line number Diff line number Diff line
@@ -86,4 +86,4 @@ sys_call_table: 
/*330*/	.long sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime

/*335*/	.long sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev

/*340*/	.long sys_ni_syscall, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr

/*345*/	.long sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create
 
/*345*/	.long sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf

arch/sparc/kernel/systbls_64.S

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ sys_call_table32: 
/*330*/	.word compat_sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, compat_sys_open_by_handle_at, compat_sys_clock_adjtime

	.word sys_syncfs, compat_sys_sendmmsg, sys_setns, compat_sys_process_vm_readv, compat_sys_process_vm_writev

/*340*/	.word sys_kern_features, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr

	.word sys32_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create

	.word sys32_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf



#endif /* CONFIG_COMPAT */
@@ -166,4 +166,4 @@ sys_call_table: 
/*330*/	.word sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime

	.word sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev

/*340*/	.word sys_kern_features, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr

	.word sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create
 
	.word sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf

drivers/block/sunvdc.c

+0 −9
Original line number Diff line number Diff line
@@ -69,8 +69,6 @@ struct vdc_port { 
	u8			vdisk_mtype;



	char			disk_name[32];



	struct vio_disk_vtoc	label;

};



static inline struct vdc_port *to_vdc_port(struct vio_driver_state *vio)
@@ -710,13 +708,6 @@ static int probe_disk(struct vdc_port *port) 
	if (comp.err)

		return comp.err;



	err = generic_request(port, VD_OP_GET_VTOC,

			      &port->label, sizeof(port->label));

	if (err < 0) {

		printk(KERN_ERR PFX "VD_OP_GET_VTOC returns error %d\n", err);

		return err;

	}



	if (vdc_version_supported(port, 1, 1)) {

		/* vdisk_size should be set during the handshake, if it wasn't

		 * then the underlying disk is reserved by another system

CRA Git | Maintained and supported by SUSTech CRA and CCSE