Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze (e0e170bd) · Commits · 戴 / test

arch/microblaze/Kconfig

+17 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,23 @@ config CMDLINE_FORCE
		Set this to have arguments from the default kernel command string
		override those passed by the boot loader.

		config SECCOMP
		bool "Enable seccomp to safely compute untrusted bytecode"
		depends on PROC_FS
		default y
		help
		This kernel feature is useful for number crunching applications
		that may need to compute untrusted bytecode during their
		execution. By using pipes or other transports made available to
		the process as file descriptors supporting the read/write
		syscalls, it's possible to isolate those applications in
		their own address space using seccomp. Once seccomp is
		enabled via /proc/<pid>/seccomp, it cannot be disabled
		and the task is only allowed to execute a few safe syscalls
		defined by each seccomp mode.

		If unsure, say Y. Only embedded should say N here.

		endmenu

		menu "Advanced setup"

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ source "lib/Kconfig.debug"

		config EARLY_PRINTK
		bool "Early printk function for kernel"
		depends on SERIAL_UARTLITE_CONSOLE
		depends on SERIAL_UARTLITE_CONSOLE \|\| SERIAL_8250_CONSOLE
		default n
		help
		This option turns on/off early printk messages to console.

+6 −5

Original line number	Diff line number	Diff line
		@@ -42,11 +42,8 @@ KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2)
		LDFLAGS :=
		LDFLAGS_vmlinux :=

		LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)

		head-y := arch/microblaze/kernel/head.o
		libs-y += arch/microblaze/lib/
		libs-y += $(LIBGCC)
		core-y += arch/microblaze/kernel/
		core-y += arch/microblaze/mm/
		core-y += arch/microblaze/platform/
		@@ -72,12 +69,16 @@ export MMU DTB

		all: linux.bin

		BOOT_TARGETS = linux.bin linux.bin.gz simpleImage.%
		# With make 3.82 we cannot mix normal and wildcard targets
		BOOT_TARGETS1 = linux.bin linux.bin.gz
		BOOT_TARGETS2 = simpleImage.%

		archclean:
		$(Q)$(MAKE) $(clean)=$(boot)

		$(BOOT_TARGETS): vmlinux
		$(BOOT_TARGETS1): vmlinux
		$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
		$(BOOT_TARGETS2): vmlinux
		$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

		define archhelp

+4 −0

Original line number	Diff line number	Diff line
		#ifndef _ASM_MICROBLAZE_BYTEORDER_H
		#define _ASM_MICROBLAZE_BYTEORDER_H

		#ifdef __MICROBLAZEEL__
		#include <linux/byteorder/little_endian.h>
		#else
		#include <linux/byteorder/big_endian.h>
		#endif

		#endif /* _ASM_MICROBLAZE_BYTEORDER_H */

+7 −2

Original line number	Diff line number	Diff line
		@@ -24,8 +24,13 @@ csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
		"addc %0, %0, %3\n\t"
		"addc %0, %0, r0\n\t"
		: "+&d" (sum)
		: "d" (saddr), "d" (daddr), "d" (len + proto));

		: "d" (saddr), "d" (daddr),
		#ifdef __MICROBLAZEEL__
		"d" ((len + proto) << 8)
		#else
		"d" (len + proto)
		#endif
		);
		return sum;
		}