diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 12:53:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 12:53:04 -0400 |
commit | abf5940dad78dde95edd7f6ba6e329cd10a92a5c (patch) | |
tree | eebc8af6a41ad11c92d8f2858700c11bec558eb3 /arch/blackfin/mm/init.c | |
parent | 66bc4a6f34a950c7aede597c578352c3eba82017 (diff) | |
parent | 5bf9cbef9972f851172391a37261b12bba63f733 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (75 commits)
Blackfin: update ftrace for latest toolchain
Blackfin: fix elf_fpregset_t definition
Blackfin: unify cache init functions
Blackfin: swap clocksource ratings for gptimer/cycles
Blackfin: update ftrace_push_return_trace() breakage
Blackfin: update cm board resources
Blackfin: cm-bf537u: split board from cm-bf537e
Blackfin: bf538-ezkit: add SPI IRQ resources
Blackfin: increase default async timings for parallel flashes
Blackfin: add ICPLB coverage for async banks
Blackfin: use KERN_ALERT in all kgdb_test output
Blackfin: fix BF54x SPI CS resources
Blackfin: fix typo in isram_write()
Blackfin: bf537-stamp: add adp5588 gpio resources
Blackfin: add some isram-driver self tests
Blackfin: workaround anomaly 05000283
Blackfin: fix spelling in a few comments
Blackfin: use raw_smp_processor_id() in exception code
Blackfin: remove useless duplicated assignment in gpio code
Blackfin: Fix link errors with binutils 2.19 and GCC 4.3
...
Diffstat (limited to 'arch/blackfin/mm/init.c')
-rw-r--r-- | arch/blackfin/mm/init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c index 68bd0bd680cd..b88ce7fda548 100644 --- a/arch/blackfin/mm/init.c +++ b/arch/blackfin/mm/init.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <asm/bfin-global.h> | 33 | #include <asm/bfin-global.h> |
34 | #include <asm/pda.h> | 34 | #include <asm/pda.h> |
35 | #include <asm/cplbinit.h> | 35 | #include <asm/cplbinit.h> |
36 | #include <asm/early_printk.h> | ||
36 | #include "blackfin_sram.h" | 37 | #include "blackfin_sram.h" |
37 | 38 | ||
38 | /* | 39 | /* |
@@ -113,6 +114,8 @@ asmlinkage void __init init_pda(void) | |||
113 | { | 114 | { |
114 | unsigned int cpu = raw_smp_processor_id(); | 115 | unsigned int cpu = raw_smp_processor_id(); |
115 | 116 | ||
117 | early_shadow_stamp(); | ||
118 | |||
116 | /* Initialize the PDA fields holding references to other parts | 119 | /* Initialize the PDA fields holding references to other parts |
117 | of the memory. The content of such memory is still | 120 | of the memory. The content of such memory is still |
118 | undefined at the time of the call, we are only setting up | 121 | undefined at the time of the call, we are only setting up |