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

Commit 11db81a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-3.13-rc1' of git://git.monstr.eu/linux-2.6-microblaze 

Pull microblaze updates from Michal Simek:
 - Get rid of NO_MMU Kconfig
 - mmap2 fixups
 - Some minor cleanups

* tag 'microblaze-3.13-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Remove incorrect file path
  microblaze: Fix bug with mmap2 syscall MB implementation
  microblaze: Use predefined SYSCALL_DEFINE macro
  microblaze: Remove deprecated IRQF_DISABLED
  microblaze: Calculate kernel pad automatically
  microblaze: Remove unused NO_MMU Kconfig parameter
parents 0993537b 63d7bd1b

arch/microblaze/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -82,11 +82,6 @@ config MMU 
	bool "MMU support"

	default n



config NO_MMU

	bool

	depends on !MMU

	default y



comment "Boot options"



config CMDLINE_BOOL
@@ -250,10 +245,6 @@ config MICROBLAZE_64K_PAGES 


endchoice



config KERNEL_PAD

	hex "Kernel PAD for unpacking" if ADVANCED_OPTIONS

	default "0x80000" if MMU



endmenu



source "mm/Kconfig"

arch/microblaze/boot/dts/Makefile

+0 −2
Original line number Diff line number Diff line 
#

# arch/microblaze/boot/Makefile

#



obj-y += linked_dtb.o

arch/microblaze/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ _invalidate: 
	/* start to do TLB calculation */

	addik	r12, r0, _end

	rsub	r12, r3, r12

	addik	r12, r12, CONFIG_KERNEL_PAD /* that's the pad */

	addik	r12, r12, CONFIG_LOWMEM_SIZE >> PTE_SHIFT /* that's the pad */



	or r9, r0, r0 /* TLB0 = 0 */

	or r10, r0, r0 /* TLB1 = 0 */

arch/microblaze/kernel/hw_exception_handler.S

+2 −2
Original line number Diff line number Diff line
@@ -193,8 +193,8 @@ 
 *      -                            W   S   REG   EXC

 *

 *

 * STACK FRAME STRUCTURE (for NO_MMU)

 * ---------------------------------

 * STACK FRAME STRUCTURE (for CONFIG_MMU=n)

 * ----------------------------------------

 *

 *      +-------------+         + 0

 *      |     MSR     |

arch/microblaze/kernel/sys_microblaze.c

+14 −3
Original line number Diff line number Diff line
@@ -33,12 +33,23 @@ 
#include <linux/slab.h>

#include <asm/syscalls.h>



asmlinkage long sys_mmap(unsigned long addr, unsigned long len,

			unsigned long prot, unsigned long flags,

			unsigned long fd, off_t pgoff)

SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len,

		unsigned long, prot, unsigned long, flags, unsigned long, fd,

		off_t, pgoff)

{

	if (pgoff & ~PAGE_MASK)

		return -EINVAL;



	return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT);

}



SYSCALL_DEFINE6(mmap2, unsigned long, addr, unsigned long, len,

		unsigned long, prot, unsigned long, flags, unsigned long, fd,

		unsigned long, pgoff)

{

	if (pgoff & (~PAGE_MASK >> 12))

		return -EINVAL;



	return sys_mmap_pgoff(addr, len, prot, flags, fd,

			      pgoff >> (PAGE_SHIFT - 12));

}