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

Commit 619df5d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-3.17-rc5' of git://git.monstr.eu/linux-2.6-microblaze 

Pull arch/microblaze fixes from Michal Simek:
 - Kconfig menu structure fix
 - fix number of syscalls
 - fix compilation warnings from allmodconfig

* tag 'microblaze-3.17-rc5' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Fix number of syscalls
  microblaze: Rename Advance setup to Kernel features
  microblaze: Add mm/Kconfig to advance menu
  arch/microblaze/include/asm/uaccess.h: Use pr_devel() instead of pr_debug()
  arch/microblaze/include/asm/entry.h: Include "linux/linkage.h" to avoid compiling issue
parents 8c68face 9fc4b7e2

arch/microblaze/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ config SECCOMP 


endmenu



menu "Advanced setup"

menu "Kernel features"



config ADVANCED_OPTIONS

	bool "Prompt for advanced kernel configuration options"
@@ -248,10 +248,10 @@ config MICROBLAZE_64K_PAGES 


endchoice



endmenu



source "mm/Kconfig"



endmenu



menu "Executable file formats"



source "fs/Kconfig.binfmt"

arch/microblaze/include/asm/entry.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <asm/percpu.h>

#include <asm/ptrace.h>

#include <linux/linkage.h>



/*

 * These are per-cpu variables required in entry.S, among other

arch/microblaze/include/asm/uaccess.h

+2 −2
Original line number Diff line number Diff line
@@ -98,13 +98,13 @@ static inline int access_ok(int type, const void __user *addr, 


	if ((get_fs().seg < ((unsigned long)addr)) ||

			(get_fs().seg < ((unsigned long)addr + size - 1))) {

		pr_debug("ACCESS fail: %s at 0x%08x (size 0x%x), seg 0x%08x\n",

		pr_devel("ACCESS fail: %s at 0x%08x (size 0x%x), seg 0x%08x\n",

			type ? "WRITE" : "READ ", (__force u32)addr, (u32)size,

			(u32)get_fs().seg);

		return 0;

	}

ok:

	pr_debug("ACCESS OK: %s at 0x%08x (size 0x%x), seg 0x%08x\n",

	pr_devel("ACCESS OK: %s at 0x%08x (size 0x%x), seg 0x%08x\n",

			type ? "WRITE" : "READ ", (__force u32)addr, (u32)size,

			(u32)get_fs().seg);

	return 1;

arch/microblaze/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,6 @@ 


#endif /* __ASSEMBLY__ */



#define __NR_syscalls         381

#define __NR_syscalls         387



#endif /* _ASM_MICROBLAZE_UNISTD_H */