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

Commit 005882e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sparc fixes from David Miller:
 "Two Sparc bug fixes from Daniel Jordan and Nitin Gupta"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix hugepage page table free
  sparc64: Use LOCKDEP_SMALL, not PROVE_LOCKING_SMALL
parents 40d9018e 544f8f93

arch/sparc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ config SPARC 
	select ARCH_HAS_SG_CHAIN

	select CPU_NO_EFFICIENT_FFS

	select HAVE_ARCH_HARDENED_USERCOPY

	select PROVE_LOCKING_SMALL if PROVE_LOCKING

	select LOCKDEP_SMALL if LOCKDEP

	select ARCH_WANT_RELAX_ORDER



config SPARC32

arch/sparc/mm/hugetlbpage.c

+16 −0
Original line number Diff line number Diff line
@@ -461,6 +461,22 @@ void hugetlb_free_pgd_range(struct mmu_gather *tlb, 
	pgd_t *pgd;

	unsigned long next;



	addr &= PMD_MASK;

	if (addr < floor) {

		addr += PMD_SIZE;

		if (!addr)

			return;

	}

	if (ceiling) {

		ceiling &= PMD_MASK;

		if (!ceiling)

			return;

	}

	if (end - 1 > ceiling - 1)

		end -= PMD_SIZE;

	if (addr > end - 1)

		return;



	pgd = pgd_offset(tlb->mm, addr);

	do {

		next = pgd_addr_end(addr, end);

kernel/locking/lockdep_internals.h

+3 −3
Original line number Diff line number Diff line
@@ -46,13 +46,13 @@ enum { 
		(LOCKF_USED_IN_HARDIRQ_READ | LOCKF_USED_IN_SOFTIRQ_READ)



/*

 * CONFIG_PROVE_LOCKING_SMALL is defined for sparc. Sparc requires .text,

 * CONFIG_LOCKDEP_SMALL is defined for sparc. Sparc requires .text,

 * .data and .bss to fit in required 32MB limit for the kernel. With

 * PROVE_LOCKING we could go over this limit and cause system boot-up problems.

 * CONFIG_LOCKDEP we could go over this limit and cause system boot-up problems.

 * So, reduce the static allocations for lockdeps related structures so that

 * everything fits in current required size limit.

 */

#ifdef CONFIG_PROVE_LOCKING_SMALL

#ifdef CONFIG_LOCKDEP_SMALL

/*

 * MAX_LOCKDEP_ENTRIES is the maximum number of lock dependencies

 * we track.

lib/Kconfig.debug

+3 −3
Original line number Diff line number Diff line
@@ -1103,9 +1103,6 @@ config PROVE_LOCKING 


	 For more details, see Documentation/locking/lockdep-design.txt.



config PROVE_LOCKING_SMALL

	bool



config LOCKDEP

	bool

	depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
@@ -1114,6 +1111,9 @@ config LOCKDEP 
	select KALLSYMS

	select KALLSYMS_ALL



config LOCKDEP_SMALL

	bool



config LOCK_STAT

	bool "Lock usage statistics"

	depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT