From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Apr 2012 00:37:38 +0000 (+1000)
Subject: Merge remote-tracking branch 'tile/master'
X-Git-Tag: next-20120402~50
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e68218353418184ef29aa240dfc4fa3a73db8947;p=karo-tx-linux.git

Merge remote-tracking branch 'tile/master'

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

e68218353418184ef29aa240dfc4fa3a73db8947
diff --cc arch/tile/include/asm/pgtable.h
index 67490910774d,ff01704ab2c4..73b1a4c9ad03
--- a/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 e58613e0752f,7caf0f36b030..c67eb70ea78e
--- a/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);
  
 +/* 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);
- void grant_network_mpls(void);
- void restrict_network_mpls(void);
 +struct task_struct;
- int hardwall_deactivate(struct task_struct *task);
++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 (p->thread.hardwall && !cpumask_equal(&p->cpus_allowed, new_mask)) \
- 		hardwall_deactivate(p); \
++	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 7a9327046404,663c97c7483d..a9993d0e5ece
--- a/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>