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

Commit 9c317b3b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] allow setting of upper 32 bit in smp_ctl_set_bit
  [S390] hwsampler: Set a sane default sampling rate
  [S390] s390: enforce HW limits for the initial sampling rate
  [S390] kvm-s390: fix kconfig dependencies
parents 258e43fd 859c9651

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -579,6 +579,7 @@ config S390_GUEST 
	def_bool y

	prompt "s390 guest support for KVM (EXPERIMENTAL)"

	depends on 64BIT && EXPERIMENTAL

	select VIRTUALIZATION

	select VIRTIO

	select VIRTIO_RING

	select VIRTIO_CONSOLE

arch/s390/kernel/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ void smp_ctl_set_bit(int cr, int bit) 


	memset(&parms.orvals, 0, sizeof(parms.orvals));

	memset(&parms.andvals, 0xff, sizeof(parms.andvals));

	parms.orvals[cr] = 1 << bit;

	parms.orvals[cr] = 1UL << bit;

	on_each_cpu(smp_ctl_bit_callback, &parms, 1);

}

EXPORT_SYMBOL(smp_ctl_set_bit);
@@ -276,7 +276,7 @@ void smp_ctl_clear_bit(int cr, int bit) 


	memset(&parms.orvals, 0, sizeof(parms.orvals));

	memset(&parms.andvals, 0xff, sizeof(parms.andvals));

	parms.andvals[cr] = ~(1L << bit);

	parms.andvals[cr] = ~(1UL << bit);

	on_each_cpu(smp_ctl_bit_callback, &parms, 1);

}

EXPORT_SYMBOL(smp_ctl_clear_bit);

arch/s390/oprofile/init.c

+7 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ extern void s390_backtrace(struct pt_regs * const regs, unsigned int depth); 


#include "hwsampler.h"



#define DEFAULT_INTERVAL	4096

#define DEFAULT_INTERVAL	4127518



#define DEFAULT_SDBT_BLOCKS	1

#define DEFAULT_SDB_BLOCKS	511
@@ -151,6 +151,12 @@ static int oprofile_hwsampler_init(struct oprofile_operations *ops) 
	if (oprofile_max_interval == 0)

		return -ENODEV;



	/* The initial value should be sane */

	if (oprofile_hw_interval < oprofile_min_interval)

		oprofile_hw_interval = oprofile_min_interval;

	if (oprofile_hw_interval > oprofile_max_interval)

		oprofile_hw_interval = oprofile_max_interval;



	if (oprofile_timer_init(ops))

		return -ENODEV;