diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-29 08:46:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-29 08:47:05 -0400 |
| commit | e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a (patch) | |
| tree | 4ba588631dd8189a818a91c9e3976526071178b6 /arch/powerpc/mm | |
| parent | 1130b0296184bc21806225fd06d533515a99d2db (diff) | |
| parent | 56a50adda49b2020156616c4eb15353e0f9ad7de (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/mm/tlb_nohash.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/mm/tlb_nohash_low.S | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index db556d25c3a7..1ade7eb6ae00 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c | |||
| @@ -753,7 +753,7 @@ void __init early_init_mmu(void) | |||
| 753 | } | 753 | } |
| 754 | 754 | ||
| 755 | #ifdef CONFIG_SMP | 755 | #ifdef CONFIG_SMP |
| 756 | void __init early_init_mmu_secondary(void) | 756 | void __cpuinit early_init_mmu_secondary(void) |
| 757 | { | 757 | { |
| 758 | /* Initialize hash table for that CPU */ | 758 | /* Initialize hash table for that CPU */ |
| 759 | if (!firmware_has_feature(FW_FEATURE_LPAR)) | 759 | if (!firmware_has_feature(FW_FEATURE_LPAR)) |
diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c index 7af72970faed..ad2eb4d34dd4 100644 --- a/arch/powerpc/mm/tlb_nohash.c +++ b/arch/powerpc/mm/tlb_nohash.c | |||
| @@ -125,7 +125,6 @@ static void do_flush_tlb_page_ipi(void *param) | |||
| 125 | 125 | ||
| 126 | void flush_tlb_mm(struct mm_struct *mm) | 126 | void flush_tlb_mm(struct mm_struct *mm) |
| 127 | { | 127 | { |
| 128 | cpumask_t cpu_mask; | ||
| 129 | unsigned int pid; | 128 | unsigned int pid; |
| 130 | 129 | ||
| 131 | preempt_disable(); | 130 | preempt_disable(); |
diff --git a/arch/powerpc/mm/tlb_nohash_low.S b/arch/powerpc/mm/tlb_nohash_low.S index 788b87c36f77..3037911279b1 100644 --- a/arch/powerpc/mm/tlb_nohash_low.S +++ b/arch/powerpc/mm/tlb_nohash_low.S | |||
| @@ -191,6 +191,6 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_USE_TLBILX) | |||
| 191 | isync | 191 | isync |
| 192 | 1: wrtee r10 | 192 | 1: wrtee r10 |
| 193 | blr | 193 | blr |
| 194 | #elif | 194 | #else |
| 195 | #error Unsupported processor type ! | 195 | #error Unsupported processor type ! |
| 196 | #endif | 196 | #endif |