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

Merge tag 'for-linus' of git://github.com/openrisc/linux 

Pull OpenRISC updates from Stafford Horne:
 "This includes two minor cleanups, plus a bug fix for OpenRISC TLB
  flush code that allows the the SMP kernel to boot again"

* tag 'for-linus' of git://github.com/openrisc/linux:
  openrisc: fix SMP tlb flush NULL pointer dereference
  openrisc: signal: remove unused DEBUG_SIG macro
  openrisc: time: don't mark comment as kernel-doc
parents bbdbeb00 27dff9a9

arch/openrisc/kernel/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ page_set_nocache(pte_t *pte, unsigned long addr, 
	 * Flush the page out of the TLB so that the new page flags get

	 * picked up next time there's an access

	 */

	flush_tlb_page(NULL, addr);

	flush_tlb_kernel_range(addr, addr + PAGE_SIZE);



	/* Flush page out of dcache */

	for (cl = __pa(addr); cl < __pa(next); cl += cpuinfo->dcache_block_size)
@@ -56,7 +56,7 @@ page_clear_nocache(pte_t *pte, unsigned long addr, 
	 * Flush the page out of the TLB so that the new page flags get

	 * picked up next time there's an access

	 */

	flush_tlb_page(NULL, addr);

	flush_tlb_kernel_range(addr, addr + PAGE_SIZE);



	return 0;

}

arch/openrisc/kernel/signal.c

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
#include <asm/ucontext.h>

#include <linux/uaccess.h>



#define DEBUG_SIG 0



struct rt_sigframe {

	struct siginfo info;

	struct ucontext uc;

arch/openrisc/kernel/smp.c

+4 −2
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static inline void ipi_flush_tlb_range(void *info) 
	local_flush_tlb_range(NULL, fd->addr1, fd->addr2);

}



static void smp_flush_tlb_range(struct cpumask *cmask, unsigned long start,

static void smp_flush_tlb_range(const struct cpumask *cmask, unsigned long start,

				unsigned long end)

{

	unsigned int cpuid;
@@ -316,7 +316,9 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr) 
void flush_tlb_range(struct vm_area_struct *vma,

		     unsigned long start, unsigned long end)

{

	smp_flush_tlb_range(mm_cpumask(vma->vm_mm), start, end);

	const struct cpumask *cmask = vma ? mm_cpumask(vma->vm_mm)

					  : cpu_online_mask;

	smp_flush_tlb_range(cmask, start, end);

}



/* Instruction cache invalidate - performed on each cpu */

arch/openrisc/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ irqreturn_t __irq_entry timer_interrupt(struct pt_regs *regs) 
	return IRQ_HANDLED;

}



/**

/*

 * Clocksource: Based on OpenRISC timer/counter

 *

 * This sets up the OpenRISC Tick Timer as a clock source.  The tick timer