Commit 93bb533a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull OpenRISC fixes from Stafford Horne:
 "A few fixes that came in around the time of the merge window"

* tag 'for-linus' of git://github.com/openrisc/linux:
  openrisc: Define memory barrier mb
  openrisc: mm/init.c: remove unused variable 'end' in paging_init()
  openrisc: mm/init.c: remove unused memblock_region variable in map_ram()
  openrisc: Fix a memory leak
parents 79a106fc 8b549c18

arch/openrisc/include/asm/barrier.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __ASM_BARRIER_H

#define __ASM_BARRIER_H



#define mb() asm volatile ("l.msync" ::: "memory")



#include <asm-generic/barrier.h>



#endif /* __ASM_BARRIER_H */

arch/openrisc/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -278,6 +278,8 @@ void calibrate_delay(void) 
	pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",

		loops_per_jiffy / (500000 / HZ),

		(loops_per_jiffy / (5000 / HZ)) % 100, loops_per_jiffy);



	of_node_put(cpu);

}



void __init setup_arch(char **cmdline_p)

arch/openrisc/mm/init.c

+1 −5
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static void __init map_ram(void) 
	/* These mark extents of read-only kernel pages...

	 * ...from vmlinux.lds.S

	 */

	struct memblock_region *region;



	v = PAGE_OFFSET;
@@ -121,7 +120,7 @@ static void __init map_ram(void) 
		}



		printk(KERN_INFO "%s: Memory: 0x%x-0x%x\n", __func__,

		       region->base, region->base + region->size);

		       start, end);

	}

}
@@ -129,7 +128,6 @@ void __init paging_init(void) 
{

	extern void tlb_init(void);



	unsigned long end;

	int i;



	printk(KERN_INFO "Setting up paging and PTEs.\n");
@@ -145,8 +143,6 @@ void __init paging_init(void) 
	 */

	current_pgd[smp_processor_id()] = init_mm.pgd;



	end = (unsigned long)__va(max_low_pfn * PAGE_SIZE);



	map_ram();



	zone_sizes_init();