Merge tag 'xtensa-20180914' of git://github.com/jcmvbkbc/linux-xtensa (eae4f885) · Commits · 戴 / test

arch/xtensa/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ config ZONE_DMA

		config XTENSA
		def_bool y
		select ARCH_HAS_SG_CHAIN
		select ARCH_HAS_SYNC_DMA_FOR_CPU
		select ARCH_HAS_SYNC_DMA_FOR_DEVICE
		select ARCH_NO_COHERENT_DMA_MMAP if !MMU

+0 −4

Original line number	Diff line number	Diff line
		@@ -64,11 +64,7 @@ endif
		vardirs := $(patsubst %,arch/xtensa/variants/%/,$(variant-y))
		plfdirs := $(patsubst %,arch/xtensa/platforms/%/,$(platform-y))

		ifeq ($(KBUILD_SRC),)
		KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(vardirs) $(plfdirs))
		else
		KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(vardirs) $(plfdirs))
		endif

		KBUILD_DEFCONFIG := iss_defconfig

+15 −10

Original line number	Diff line number	Diff line
		@@ -78,12 +78,16 @@ static struct notifier_block iss_panic_block = {

		void __init platform_setup(char **p_cmdline)
		{
		static void argv[COMMAND_LINE_SIZE / sizeof(void )] __initdata;
		static char cmdline[COMMAND_LINE_SIZE] __initdata;
		int argc = simc_argc();
		int argv_size = simc_argv_size();

		if (argc > 1) {
		void **argv = alloc_bootmem(argv_size);
		char *cmdline = alloc_bootmem(argv_size);
		if (argv_size > sizeof(argv)) {
		pr_err("%s: command line too long: argv_size = %d\n",
		__func__, argv_size);
		} else {
		int i;

		cmdline[0] = 0;
		@@ -96,6 +100,7 @@ void __init platform_setup(char **p_cmdline)
		}
		*p_cmdline = cmdline;
		}
		}

		atomic_notifier_chain_register(&panic_notifier_list, &iss_panic_block);
		}