diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-18 05:37:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-18 05:37:43 -0400 |
| commit | 04dfcfcb54b073133bcca2c8f25b55e904558931 (patch) | |
| tree | 123d13f9e242751f629924e92fcb297dc669d767 /arch/blackfin/mm | |
| parent | 0bd5c4f7c874cf48ff7904dcf8a59988c8fea0e8 (diff) | |
| parent | ee568b25ee9e160b32d1aef73d8b2ee9c05d34db (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/blackfin/mm')
| -rw-r--r-- | arch/blackfin/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c index d0532b72bba5..9c3629b9a689 100644 --- a/arch/blackfin/mm/init.c +++ b/arch/blackfin/mm/init.c | |||
| @@ -104,7 +104,7 @@ void __init paging_init(void) | |||
| 104 | } | 104 | } |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | asmlinkage void init_pda(void) | 107 | asmlinkage void __init init_pda(void) |
| 108 | { | 108 | { |
| 109 | unsigned int cpu = raw_smp_processor_id(); | 109 | unsigned int cpu = raw_smp_processor_id(); |
| 110 | 110 | ||