Commit 6b54698a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-5.16c-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fixes from Juergen Gross:

 - Kconfig fix to make it possible to control building of the privcmd
   driver

 - three fixes for issues identified by the kernel test robot

 - a five-patch series to simplify timeout handling for Xen PV driver
   initialization

 - two patches to fix error paths in xenstore/xenbus driver
   initialization

* tag 'for-linus-5.16c-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: make HYPERVISOR_set_debugreg() always_inline
  xen: make HYPERVISOR_get_debugreg() always_inline
  xen: detect uninitialized xenbus in xenbus_init
  xen: flag xen_snd_front to be not essential for system boot
  xen: flag pvcalls-front to be not essential for system boot
  xen: flag hvc_xen to be not essential for system boot
  xen: flag xen_drm_front to be not essential for system boot
  xen: add "not_essential" flag to struct xenbus_driver
  xen/pvh: add missing prototype to header
  xen: don't continue xenstore initialization in case of errors
  xen/privcmd: make option visible in Kconfig
parents f17fb26d 00db58cf

arch/x86/include/asm/xen/hypercall.h

+2 −2
Original line number Diff line number Diff line
@@ -281,13 +281,13 @@ HYPERVISOR_callback_op(int cmd, void *arg) 
	return _hypercall2(int, callback_op, cmd, arg);

}



static inline int

static __always_inline int

HYPERVISOR_set_debugreg(int reg, unsigned long value)

{

	return _hypercall2(int, set_debugreg, reg, value);

}



static inline unsigned long

static __always_inline unsigned long

HYPERVISOR_get_debugreg(int reg)

{

	return _hypercall1(unsigned long, get_debugreg, reg);

arch/x86/include/asm/xen/hypervisor.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ void xen_arch_unregister_cpu(int num); 


#ifdef CONFIG_PVH

void __init xen_pvh_init(struct boot_params *boot_params);

void __init mem_map_via_hcall(struct boot_params *boot_params_p);

#endif



#endif /* _ASM_X86_XEN_HYPERVISOR_H */

drivers/gpu/drm/xen/xen_drm_front.c

+1 −0
Original line number Diff line number Diff line
@@ -773,6 +773,7 @@ static struct xenbus_driver xen_driver = { 
	.probe = xen_drv_probe,

	.remove = xen_drv_remove,

	.otherend_changed = displback_changed,

	.not_essential = true,

};



static int __init xen_drv_init(void)

drivers/input/misc/xen-kbdfront.c

+1 −0
Original line number Diff line number Diff line
@@ -542,6 +542,7 @@ static struct xenbus_driver xenkbd_driver = { 
	.remove = xenkbd_remove,

	.resume = xenkbd_resume,

	.otherend_changed = xenkbd_backend_changed,

	.not_essential = true,

};



static int __init xenkbd_init(void)

drivers/tty/hvc/hvc_xen.c

+1 −0
Original line number Diff line number Diff line
@@ -522,6 +522,7 @@ static struct xenbus_driver xencons_driver = { 
	.remove = xencons_remove,

	.resume = xencons_resume,

	.otherend_changed = xencons_backend_changed,

	.not_essential = true,

};

#endif /* CONFIG_HVC_XEN_FRONTEND */