Merge remote-tracking branch 'tile/master'

Conflicts:
	arch/tile/include/asm/barrier.h
	arch/tile/include/asm/pgtable.h

diff --cc MAINTAINERS
Simple merge

diff --cc arch/tile/include/asm/atomic_32.h
Simple merge

diff --cc arch/tile/include/asm/bitops_64.h
Simple merge

diff --cc arch/tile/include/asm/pgtable.h
index 67490910774d38af80cbd3ffc84e01bffd2abece,ff01704ab2c499932502a097432ea56b89ec1812..73b1a4c9ad03f22c218f40896cbb2fdacf3142ce
--- 1/arch/tile/include/asm/pgtable.h
--- 2/arch/tile/include/asm/pgtable.h
+++ b/arch/tile/include/asm/pgtable.h
@@@ -27,8 -27,11 +27,10 @@@
  #include <linux/slab.h>
  #include <linux/list.h>
  #include <linux/spinlock.h>
+ #include <linux/pfn.h>
  #include <asm/processor.h>
  #include <asm/fixmap.h>
 -#include <asm/system.h>
+ #include <asm/page.h>
  
  struct mm_struct;
  struct vm_area_struct;

diff --cc arch/tile/include/asm/setup.h
index e58613e0752f65712dca236588747e0e893e426c,7caf0f36b0303ff99c2d8c3594bf8319e4c04d45..c67eb70ea78e94fb08410897630a96228a2e3456
--- 1/arch/tile/include/asm/setup.h
--- 2/arch/tile/include/asm/setup.h
+++ b/arch/tile/include/asm/setup.h
@@@ -31,28 -31,6 +31,28 @@@ void early_panic(const char *fmt, ...)
  void warn_early_printk(void);
  void __init disable_early_printk(void);
  
- void grant_network_mpls(void);
- void restrict_network_mpls(void);
 +/* Init-time routine to do tile-specific per-cpu setup. */
 +void setup_cpu(int boot);
 +
 +/* User-level DMA management functions */
 +void grant_dma_mpls(void);
 +void restrict_dma_mpls(void);
 +
 +#ifdef CONFIG_HARDWALL
 +/* User-level network management functions */
 +void reset_network_state(void);
- int hardwall_deactivate(struct task_struct *task);
 +struct task_struct;
-       if (p->thread.hardwall && !cpumask_equal(&p->cpus_allowed, new_mask)) \
-               hardwall_deactivate(p); \
++void hardwall_switch_tasks(struct task_struct *prev, struct task_struct *next);
++void hardwall_deactivate_all(struct task_struct *task);
++int hardwall_ipi_valid(int cpu);
 +
 +/* Hook hardwall code into changes in affinity. */
 +#define arch_set_cpus_allowed(p, new_mask) do { \
++      if (!cpumask_equal(&p->cpus_allowed, new_mask)) \
++              hardwall_deactivate_all(p); \
 +} while (0)
 +#endif
 +
  #endif /* __KERNEL__ */
  
  #endif /* _ASM_TILE_SETUP_H */

diff --cc arch/tile/kernel/proc.c
index 7a93270464045753c76caa4032716ea6981c082c,663c97c7483d7b5807ebc16c6c9989831b0b0b36..a9993d0e5ece7ceb10583317a3e7990b1b2e872a
--- 1/arch/tile/kernel/proc.c
--- 2/arch/tile/kernel/proc.c
+++ b/arch/tile/kernel/proc.c
@@@ -22,8 -22,8 +22,9 @@@
  #include <linux/proc_fs.h>
  #include <linux/sysctl.h>
  #include <linux/hardirq.h>
+ #include <linux/hugetlb.h>
  #include <linux/mman.h>
 +#include <asm/unaligned.h>
  #include <asm/pgtable.h>
  #include <asm/processor.h>
  #include <asm/sections.h>

diff --cc arch/tile/kernel/process.c
Simple merge

diff --cc arch/tile/kernel/single_step.c
Simple merge

diff --cc arch/tile/kernel/smp.c
Simple merge

diff --cc arch/tile/kernel/traps.c
Simple merge

diff --cc arch/tile/mm/fault.c
Simple merge

diff --cc arch/tile/mm/init.c
Simple merge

diff --cc arch/tile/mm/pgtable.c
Simple merge

diff --cc drivers/net/ethernet/tile/tilepro.c
Simple merge

diff --cc include/asm-generic/pgtable.h
Simple merge

diff --cc include/linux/hugetlb.h
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/pgtable-generic.c
Simple merge