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

Commit 94830f18 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-master-5.2-1' of... 

Merge tag 'kvm-s390-master-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

KVM: s390: Fixes for s390

- Fix typo in module parameter description
- Change default poll timer to improve cpu consumption
parents a188339c 6e9b622d

arch/s390/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
 */

#define KVM_NR_IRQCHIPS 1

#define KVM_IRQCHIP_NUM_PINS 4096

#define KVM_HALT_POLL_NS_DEFAULT 80000

#define KVM_HALT_POLL_NS_DEFAULT 50000



/* s390-specific vcpu->requests bit members */

#define KVM_REQ_ENABLE_IBS	KVM_ARCH_REQ(0)

arch/s390/kvm/kvm-s390.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ MODULE_PARM_DESC(hpage, "1m huge page backing support"); 
/* maximum percentage of steal time for polling.  >100 is treated like 100 */

static u8 halt_poll_max_steal = 10;

module_param(halt_poll_max_steal, byte, 0644);

MODULE_PARM_DESC(hpage, "Maximum percentage of steal time to allow polling");

MODULE_PARM_DESC(halt_poll_max_steal, "Maximum percentage of steal time to allow polling");



/*

 * For now we handle at most 16 double words as this is what the s390 base