Merge tag 'v3.14.78' into linux-3.14.x-grsecurity-3.1

This is the 3.14.78 stable release

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --cc Makefile
Simple merge

diff --cc arch/x86/include/asm/tlbflush.h
index 1178cdf1600fccf80f3cfb6f1d1313d4b0be85c5,5e4b0cc54e4337bf5f52ca29476484fd052240f3..54e9aeae1ca74e129ba977835984b65c0b56e229
--- 1/arch/x86/include/asm/tlbflush.h
--- 2/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@@ -17,26 -17,14 +17,33 @@@
  
  static inline void __native_flush_tlb(void)
  {
 +      if (static_cpu_has(X86_FEATURE_INVPCID)) {
 +              u64 descriptor[2];
 +
 +              descriptor[0] = PCID_KERNEL;
 +              asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
 +              return;
 +      }
 +
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +      if (static_cpu_has(X86_FEATURE_PCID)) {
 +              unsigned int cpu = raw_get_cpu();
 +
 +              native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
 +              native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
 +              raw_put_cpu_no_resched();
 +              return;
 +      }
 +#endif
 +
+       /*
+        * If current->mm == NULL then we borrow a mm which may change during a
+        * task switch and therefore we must not be preempted while we write CR3
+        * back:
+        */
+       preempt_disable();
        native_write_cr3(native_read_cr3());
+       preempt_enable();
  }
  
  static inline void __native_flush_tlb_global_irq_disabled(void)

diff --cc drivers/acpi/sysfs.c
Simple merge

diff --cc drivers/pci/pci-sysfs.c
Simple merge

diff --cc drivers/usb/core/devices.c
Simple merge

diff --cc drivers/usb/core/hcd.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc fs/seq_file.c
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge