From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Oct 2016 00:44:48 +0000 (-0700)
Subject: Merge tag 'xtensa-20161005' of git://github.com/jcmvbkbc/linux-xtensa
X-Git-Tag: v4.9-rc1~118
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d8ea757b25ec82687c497fc90aa83f9bcea24b5b;p=linux-2.6-block.git

Merge tag 'xtensa-20161005' of git://github.com/jcmvbkbc/linux-xtensa

Pull Xtensa updates from Max Filippov:
 "Updates for the xtensa architecture.  It is a combined set of patches
  for 4.8 that never got to the mainline and new patches for 4.9.

   - add new kernel memory layouts for MMUv3 cores: with 256MB and 512MB
     KSEG size, starting at physical address other than 0

   - make kernel load address configurable

   - clean up kernel memory layout macros

   - drop sysmem early allocator and switch to memblock

   - enable kmemleak and memory reservation from the device tree

   - wire up new syscalls: userfaultfd, membarrier, mlock2,
     copy_file_range, preadv2 and pwritev2

   - add new platform: Cadence Configurable System Platform (CSP) and
     new core variant for it: xt_lnx

   - rearrange CCOUNT calibration code, make most of it generic

   - improve machine reset code (XTFPGA now reboots reliably with MMUv3
     cores)

   - provide default memmap command line option for configurations
     without device tree support

   - ISS fixes: simdisk is now capable of using highmem pages, panic
     correctly terminates simulator"

* tag 'xtensa-20161005' of git://github.com/jcmvbkbc/linux-xtensa: (24 commits)
  xtensa: disable MMU initialization option on MMUv2 cores
  xtensa: add default memmap and mmio32native options to defconfigs
  xtensa: add default memmap option to common_defconfig
  xtensa: add default memmap option to iss_defconfig
  xtensa: ISS: allow simdisk to use high memory buffers
  xtensa: ISS: define simc_exit and use it instead of inline asm
  xtensa: xtfpga: group platform_* functions together
  xtensa: rearrange CCOUNT calibration
  xtensa: xtfpga: use clock provider, don't update DT
  xtensa: Tweak xuartps UART driver Rx watermark for Cadence CSP config.
  xtensa: initialize MMU before jumping to reset vector
  xtensa: fix icountlevel setting in cpu_reset
  xtensa: extract common CPU reset code into separate function
  xtensa: Added Cadence CSP kernel configuration for Xtensa
  xtensa: fix default kernel load address
  xtensa: wire up new syscalls
  xtensa: support reserved-memory DT node
  xtensa: drop sysmem and switch to memblock
  xtensa: minimize use of PLATFORM_DEFAULT_MEM_{ADDR,SIZE}
  xtensa: cleanup MMU setup and kernel layout macros
  ...
---

d8ea757b25ec82687c497fc90aa83f9bcea24b5b
diff --cc arch/xtensa/kernel/setup.c
index 143251ede897,d61c8468abea..88a044af7504
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@@ -252,14 -246,14 +245,6 @@@ void __init early_init_devtree(void *pa
  		strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
  }
  
--static int __init xtensa_device_probe(void)
--{
- 	of_clk_init(NULL);
 -	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
--	return 0;
--}
--
--device_initcall(xtensa_device_probe);
--
  #endif /* CONFIG_OF */
  
  /*