Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (171 commits)
  Blackfin arch: fix bug - BF527 0.2 silicon has different CPUID (DSPID) value
  Blackfin arch: Enlarge flash partition for kenel for bf533/bf537 boards
  Blackfin arch: fix bug: kernel crash when enable SDIO host driver
  Blackfin arch: Print FP at level KERN_NOTICE
  Blackfin arch: drop ad73311 test code
  Blackfin arch: update board default configs
  Blackfin arch: Set PB4 as the default irq for bf548 board v1.4+.
  Blackfin arch: fix typo in early printk bit size processing
  Blackfin arch: enable reprogram cclk and sclk for bf518f-ezbrd
  Blackfin arch: add SDIO host driver platform data
  Blackfin arch: fix bug - kernel stops at initial console
  Blackfin arch: fix bug - kernel crash after config IP for ethernet port
  Blackfin arch: add sdh support for bf518f-ezbrd
  Blackfin arch: fix bug - kernel detects BF532 incorrectly
  Blackfin arch: add () to avoid warnings from gcc
  Blackfin arch: change HWTRACE Kconfig and set it on default
  Blackfin arch: Clean oprofile build path for blackfin
  Blackfin arch: remove hardware PM code, oprofile not use it
  Blackfin arch: rewrite get_sclk()/get_vco()
  Blackfin arch: cleanup and unify the ins functions
  ...

1 files changed, 22 insertions, 10 deletions

diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 0c3ea118b657..33e2e8993f7f 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -39,6 +39,7 @@
 
 #include <asm/blackfin.h>
 #include <asm/fixed_code.h>
+#include <asm/mem_map.h>
 
 asmlinkage void ret_from_fork(void);
 
@@ -81,11 +82,14 @@ void cpu_idle(void)__attribute__((l1_text));
  */
 static void default_idle(void)
 {
-        local_irq_disable();
+#ifdef CONFIG_IPIPE
+        ipipe_suspend_domain();
+#endif
+        local_irq_disable_hw();
         if (!need_resched())
                 idle_with_irq_disabled();
 
-        local_irq_enable();
+        local_irq_enable_hw();
 }
 
 /*
@@ -154,6 +158,7 @@ pid_t kernel_thread(int (*fn) (void *), void *arg, unsigned long flags)
         return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, &regs, 0, NULL,
                        NULL);
 }
+EXPORT_SYMBOL(kernel_thread);
 
 void flush_thread(void)
 {
@@ -170,6 +175,13 @@ asmlinkage int bfin_clone(struct pt_regs *regs)
         unsigned long clone_flags;
         unsigned long newsp;
 
+#ifdef __ARCH_SYNC_CORE_DCACHE
+        if (current->rt.nr_cpus_allowed == num_possible_cpus()) {
+                current->cpus_allowed = cpumask_of_cpu(smp_processor_id());
+                current->rt.nr_cpus_allowed = 1;
+        }
+#endif
+
         /* syscall2 puts clone_flags in r0 and usp in r1 */
         clone_flags = regs->r0;
         newsp = regs->r1;
@@ -337,22 +349,22 @@ int _access_ok(unsigned long addr, unsigned long size)
         if (addr >= (unsigned long)__init_begin &&
             addr + size <= (unsigned long)__init_end)
                 return 1;
-        if (addr >= L1_SCRATCH_START
-            && addr + size <= L1_SCRATCH_START + L1_SCRATCH_LENGTH)
+        if (addr >= get_l1_scratch_start()
+            && addr + size <= get_l1_scratch_start() + L1_SCRATCH_LENGTH)
                 return 1;
 #if L1_CODE_LENGTH != 0
-        if (addr >= L1_CODE_START + (_etext_l1 - _stext_l1)
-            && addr + size <= L1_CODE_START + L1_CODE_LENGTH)
+        if (addr >= get_l1_code_start() + (_etext_l1 - _stext_l1)
+            && addr + size <= get_l1_code_start() + L1_CODE_LENGTH)
                 return 1;
 #endif
 #if L1_DATA_A_LENGTH != 0
-        if (addr >= L1_DATA_A_START + (_ebss_l1 - _sdata_l1)
-            && addr + size <= L1_DATA_A_START + L1_DATA_A_LENGTH)
+        if (addr >= get_l1_data_a_start() + (_ebss_l1 - _sdata_l1)
+            && addr + size <= get_l1_data_a_start() + L1_DATA_A_LENGTH)
                 return 1;
 #endif
 #if L1_DATA_B_LENGTH != 0
-        if (addr >= L1_DATA_B_START + (_ebss_b_l1 - _sdata_b_l1)
-            && addr + size <= L1_DATA_B_START + L1_DATA_B_LENGTH)
+        if (addr >= get_l1_data_b_start() + (_ebss_b_l1 - _sdata_b_l1)
+            && addr + size <= get_l1_data_b_start() + L1_DATA_B_LENGTH)
                 return 1;
 #endif
 #if L2_LENGTH != 0