Merge tag 'v3.12-rc5' into stable/for-linus-3.13

Linux 3.12-rc5

Because the Stefano branch (for SWIOTLB ARM changes) is based on that.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
* tag 'v3.12-rc5': (550 commits)
  Linux 3.12-rc5
  watchdog: sunxi: Fix section mismatch
  watchdog: kempld_wdt: Fix bit mask definition
  watchdog: ts72xx_wdt: locking bug in ioctl
  ARM: exynos: dts: Update 5250 arch timer node with clock frequency
  parisc: let probe_kernel_read() capture access to page zero
  parisc: optimize variable initialization in do_page_fault
  parisc: fix interruption handler to respect pagefault_disable()
  parisc: mark parisc_terminate() noreturn and cold.
  parisc: remove unused syscall_ipi() function.
  parisc: kill SMP single function call interrupt
  parisc: Export flush_cache_page() (needed by lustre)
  vfs: allow O_PATH file descriptors for fstatfs()
  ext4: fix memory leak in xattr
  ARC: Ignore ptrace SETREGSET request for synthetic register "stop_pc"
  ALSA: hda - Sony VAIO Pro 13 (haswell) now has a working headset jack
  ALSA: hda - Add a headset mic model for ALC269 and friends
  ALSA: hda - Fix microphone for Sony VAIO Pro 13 (Haswell model)
  compiler/gcc4: Add quirk for 'asm goto' miscompilation bug
  Revert "i915: Update VGA arbiter support for newer devices"
  ...

diff --combined arch/arm/Kconfig
index 180c1321dbfbb1e53a2b648389ff2cd4836e89f0,1ad6fb6c094db415ec76a72a28356e75bdfd7d17..b08374f8fe3b15d2126e2e028264dcd6a7c36250
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1872,12 -1872,6 +1872,12 @@@ config CC_STACKPROTECTO
          neutralized via a kernel panic.
          This feature requires gcc version 4.2 or above.
  
 +config SWIOTLB
 +      def_bool y
 +
 +config IOMMU_HELPER
 +      def_bool SWIOTLB
 +
  config XEN_DOM0
        def_bool y
        depends on XEN
@@@ -2223,8 -2217,7 +2223,7 @@@ config NEO
  
  config KERNEL_MODE_NEON
        bool "Support for NEON in kernel mode"
-       default n
-       depends on NEON
+       depends on NEON && AEABI
        help
          Say Y to include support for NEON in kernel mode.
  

diff --combined drivers/tty/hvc/hvc_xen.c
index 6458c9f2ace0e47d57f9e636ad30247a3da996d9,c193af6a628f45758a7fcd59b1b0823e57327655..636c9baad7a58b76fc740bd49794303cfcc472ef
--- 1/drivers/tty/hvc/hvc_xen.c
--- 2/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@@ -183,7 -183,7 +183,7 @@@ static int dom0_write_console(uint32_t 
  {
        int rc = HYPERVISOR_console_io(CONSOLEIO_write, len, (char *)str);
        if (rc < 0)
 -              return 0;
 +              return rc;
  
        return len;
  }
@@@ -636,27 -636,13 +636,28 @@@ struct console xenboot_console = 
        .name           = "xenboot",
        .write          = xenboot_write_console,
        .flags          = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME,
+       .index          = -1,
  };
  #endif        /* CONFIG_EARLY_PRINTK */
  
  void xen_raw_console_write(const char *str)
  {
 -      dom0_write_console(0, str, strlen(str));
 +      ssize_t len = strlen(str);
 +      int rc = 0;
 +
 +      if (xen_domain()) {
 +              rc = dom0_write_console(0, str, len);
 +#ifdef CONFIG_X86
 +              if (rc == -ENOSYS && xen_hvm_domain())
 +                      goto outb_print;
 +
 +      } else if (xen_cpuid_base()) {
 +              int i;
 +outb_print:
 +              for (i = 0; i < len; i++)
 +                      outb(str[i], 0xe9);
 +#endif
 +      }
  }
  
  void xen_raw_printk(const char *fmt, ...)