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

Commit d63e210e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 

Pull MIPS fixes from Ralf Baechle:
 "Random small fixes across the MIPS code."

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: CMP: Fix physical core number calculation logic
  MIPS: JZ4740: Forward declare struct uart_port in header.
  MIPS: JZ4740: Fix '#include guard' in serial.h
  MIPS: hugetlbfs: Fix hazard between tlb write and pagemask restoration.
  MIPS: Restore pagemask after dumping the TLB.
  MIPS: Hugetlbfs: Handle huge pages correctly in pmd_bad()
  MIPS: R5000: Fix TLB hazard handling.
  MIPS: tlbex: Deal with re-definition of label
  MIPS: Make __{,n,u}delay declarations match definitions and generic delay.h
parents a0a6a39e 0cc40dac

arch/mips/include/asm/delay.h

+3 −3
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 


#include <linux/param.h>



extern void __delay(unsigned int loops);

extern void __ndelay(unsigned int ns);

extern void __udelay(unsigned int us);

extern void __delay(unsigned long loops);

extern void __ndelay(unsigned long ns);

extern void __udelay(unsigned long us);



#define ndelay(ns) __ndelay(ns)

#define udelay(us) __udelay(us)

arch/mips/include/asm/pgtable-64.h

+14 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#ifndef _ASM_PGTABLE_64_H

#define _ASM_PGTABLE_64_H



#include <linux/compiler.h>

#include <linux/linkage.h>



#include <asm/addrspace.h>
@@ -172,7 +173,19 @@ static inline int pmd_none(pmd_t pmd) 
	return pmd_val(pmd) == (unsigned long) invalid_pte_table;

}



#define pmd_bad(pmd)		(pmd_val(pmd) & ~PAGE_MASK)

static inline int pmd_bad(pmd_t pmd)

{

#ifdef CONFIG_HUGETLB_PAGE

	/* pmd_huge(pmd) but inline */

	if (unlikely(pmd_val(pmd) & _PAGE_HUGE))

		return 0;

#endif



	if (unlikely(pmd_val(pmd) & ~PAGE_MASK))

		return 1;



	return 0;

}



static inline int pmd_present(pmd_t pmd)

{

arch/mips/jz4740/serial.h

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
 */



#ifndef __MIPS_JZ4740_SERIAL_H__

#define __MIPS_JZ4740_SERIAL_H__



struct uart_port;



void jz4740_serial_out(struct uart_port *p, int offset, int value);

arch/mips/kernel/smp-cmp.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void cmp_init_secondary(void) 


	/* Enable per-cpu interrupts: platform specific */



	c->core = (read_c0_ebase() >> 1) & 0xff;

	c->core = (read_c0_ebase() >> 1) & 0x1ff;

#if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_MIPS_MT_SMTC)

	c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) & TCBIND_CURVPE;

#endif

arch/mips/lib/delay.c

+5 −1
Original line number Diff line number Diff line
@@ -15,13 +15,17 @@ 
#include <asm/compiler.h>

#include <asm/war.h>



inline void __delay(unsigned int loops)

void __delay(unsigned long loops)

{

	__asm__ __volatile__ (

	"	.set	noreorder				\n"

	"	.align	3					\n"

	"1:	bnez	%0, 1b					\n"

#if __SIZEOF_LONG__ == 4

	"	subu	%0, 1					\n"

#else

	"	dsubu	%0, 1					\n"

#endif

	"	.set	reorder					\n"

	: "=r" (loops)

	: "0" (loops));