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

Commit 1bbc9a66 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/kvm: Remove problematic BUILD_BUG_ON statement
  powerpc/pci: Fix regression in powerpc MSI-X
  powerpc: Avoid giving out RTC dates below EPOCH
  powerpc/mm: Remove debug context clamping from nohash code
  powerpc: Cleanup Kconfig selection of hugetlbfs support
parents 2c75910f 38634e67

arch/powerpc/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -414,6 +414,10 @@ config ARCH_SPARSEMEM_DEFAULT 
config ARCH_POPULATES_NODE_MAP

	def_bool y



config SYS_SUPPORTS_HUGETLBFS

       def_bool y

       depends on PPC_BOOK3S_64



source "mm/Kconfig"



config ARCH_MEMORY_PROBE

arch/powerpc/kernel/time.c

+14 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ int update_persistent_clock(struct timespec now) 
	return ppc_md.set_rtc_time(&tm);

}



void read_persistent_clock(struct timespec *ts)

static void __read_persistent_clock(struct timespec *ts)

{

	struct rtc_time tm;

	static int first = 1;
@@ -800,10 +800,23 @@ void read_persistent_clock(struct timespec *ts) 
		return;

	}

	ppc_md.get_rtc_time(&tm);



	ts->tv_sec = mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,

			    tm.tm_hour, tm.tm_min, tm.tm_sec);

}



void read_persistent_clock(struct timespec *ts)

{

	__read_persistent_clock(ts);



	/* Sanitize it in case real time clock is set below EPOCH */

	if (ts->tv_sec < 0) {

		ts->tv_sec = 0;

		ts->tv_nsec = 0;

	}

		

}



/* clocksource code */

static cycle_t rtc_read(struct clocksource *cs)

{

arch/powerpc/kvm/timing.h

+4 −0
Original line number Diff line number Diff line
@@ -48,7 +48,11 @@ static inline void kvmppc_set_exit_type(struct kvm_vcpu *vcpu, int type) {} 
static inline void kvmppc_account_exit_stat(struct kvm_vcpu *vcpu, int type)

{

	/* type has to be known at build time for optimization */



	/* The BUILD_BUG_ON below breaks in funny ways, commented out

	 * for now ... -BenH

	BUILD_BUG_ON(__builtin_constant_p(type));

	*/

	switch (type) {

	case EXT_INTR_EXITS:

		vcpu->stat.ext_intr_exits++;

arch/powerpc/mm/mmu_context_nohash.c

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
 *     also clear mm->cpu_vm_mask bits when processes are migrated

 */



#define DEBUG_MAP_CONSISTENCY

#define DEBUG_CLAMP_LAST_CONTEXT   31

//#define DEBUG_MAP_CONSISTENCY

//#define DEBUG_CLAMP_LAST_CONTEXT   31

//#define DEBUG_HARDER



/* We don't use DEBUG because it tends to be compiled in always nowadays

arch/powerpc/platforms/pseries/msi.c

+0 −2
Original line number Diff line number Diff line
@@ -432,8 +432,6 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) 
		/* Read config space back so we can restore after reset */

		read_msi_msg(virq, &msg);

		entry->msg = msg;



		unmask_msi_irq(virq);

	}



	return 0;