From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Dec 2008 00:10:19 +0000 (-0800)
Subject: Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip... 
X-Git-Tag: firefly_0821_release~16472
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f34fe1cfc1bdd8b4711bbe37421fba4ed0d1ed4;p=firefly-linux-kernel-4.4.55.git

Merge branch 'core-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (63 commits)
  stacktrace: provide save_stack_trace_tsk() weak alias
  rcu: provide RCU options on non-preempt architectures too
  printk: fix discarding message when recursion_bug
  futex: clean up futex_(un)lock_pi fault handling
  "Tree RCU": scalable classic RCU implementation
  futex: rename field in futex_q to clarify single waiter semantics
  x86/swiotlb: add default swiotlb_arch_range_needs_mapping
  x86/swiotlb: add default phys<->bus conversion
  x86: unify pci iommu setup and allow swiotlb to compile for 32 bit
  x86: add swiotlb allocation functions
  swiotlb: consolidate swiotlb info message printing
  swiotlb: support bouncing of HighMem pages
  swiotlb: factor out copy to/from device
  swiotlb: add arch hook to force mapping
  swiotlb: allow architectures to override phys<->bus<->phys conversions
  swiotlb: add comment where we handle the overflow of a dma mask on 32 bit
  rcu: fix rcutorture behavior during reboot
  resources: skip sanity check of busy resources
  swiotlb: move some definitions to header
  swiotlb: allow architectures to override swiotlb pool allocation
  ...

Fix up trivial conflicts in
  arch/x86/kernel/Makefile
  arch/x86/mm/init_32.c
  include/linux/hardirq.h
as per Ingo's suggestions.
---

5f34fe1cfc1bdd8b4711bbe37421fba4ed0d1ed4
diff --cc arch/x86/kernel/Makefile
index 88dd768eab6d,a9c656f2d661..d364df03c1d6
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -107,8 -105,8 +107,10 @@@ microcode-$(CONFIG_MICROCODE_INTEL)	+= 
  microcode-$(CONFIG_MICROCODE_AMD)	+= microcode_amd.o
  obj-$(CONFIG_MICROCODE)			+= microcode.o
  
 +obj-$(CONFIG_X86_CHECK_BIOS_CORRUPTION) += check.o
 +
+ obj-$(CONFIG_SWIOTLB)			+= pci-swiotlb_64.o # NB rename without _64
+ 
  ###
  # 64 bit specific files
  ifeq ($(CONFIG_X86_64),y)
diff --cc arch/x86/mm/init_32.c
index 800e1d94c1b5,2b4b14fc0c04..8655b5bb0963
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@@ -967,6 -970,10 +968,8 @@@ void __init mem_init(void
  	int codesize, reservedpages, datasize, initsize;
  	int tmp;
  
 -	start_periodic_check_for_corruption();
 -
+ 	pci_iommu_alloc();
+ 
  #ifdef CONFIG_FLATMEM
  	BUG_ON(!mem_map);
  #endif
diff --cc include/linux/hardirq.h
index 89a56d79e4c6,9b70b9231693..f83288347dda
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@@ -162,17 -163,7 +164,20 @@@ extern void irq_enter(void)
   */
  extern void irq_exit(void);
  
 -#define nmi_enter()		do { lockdep_off(); rcu_nmi_enter(); __irq_enter(); } while (0)
 -#define nmi_exit()		do { __irq_exit(); rcu_nmi_exit(); lockdep_on(); } while (0)
 +#define nmi_enter()				\
 +	do {					\
 +		ftrace_nmi_enter();		\
 +		lockdep_off();			\
++		rcu_nmi_enter();		\
 +		__irq_enter();			\
 +	} while (0)
++
 +#define nmi_exit()				\
 +	do {					\
 +		__irq_exit();			\
++		rcu_nmi_exit();			\
 +		lockdep_on();			\
 +		ftrace_nmi_exit();		\
 +	} while (0)
  
  #endif /* LINUX_HARDIRQ_H */