← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to arch/powerpc/mm/hash_native_64.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/powerpc/mm/hash_native_64.c
50
50
        case MMU_PAGE_4K:
51
51
                va &= ~0xffful;
52
52
                va |= ssize << 8;
53
 
                asm volatile(ASM_MMU_FTR_IFCLR("tlbie %0,0", PPC_TLBIE(%1,%0),
54
 
                                               %2)
55
 
                             : : "r" (va), "r"(0), "i" (MMU_FTR_TLBIE_206)
 
53
                asm volatile(ASM_FTR_IFCLR("tlbie %0,0", PPC_TLBIE(%1,%0), %2)
 
54
                             : : "r" (va), "r"(0), "i" (CPU_FTR_HVMODE_206)
56
55
                             : "memory");
57
56
                break;
58
57
        default:
61
60
                va |= penc << 12;
62
61
                va |= ssize << 8;
63
62
                va |= 1; /* L */
64
 
                asm volatile(ASM_MMU_FTR_IFCLR("tlbie %0,1", PPC_TLBIE(%1,%0),
65
 
                                               %2)
66
 
                             : : "r" (va), "r"(0), "i" (MMU_FTR_TLBIE_206)
 
63
                asm volatile(ASM_FTR_IFCLR("tlbie %0,1", PPC_TLBIE(%1,%0), %2)
 
64
                             : : "r" (va), "r"(0), "i" (CPU_FTR_HVMODE_206)
67
65
                             : "memory");
68
66
                break;
69
67
        }
98
96
 
99
97
static inline void tlbie(unsigned long va, int psize, int ssize, int local)
100
98
{
101
 
        unsigned int use_local = local && cpu_has_feature(CPU_FTR_TLBIEL);
102
 
        int lock_tlbie = !cpu_has_feature(CPU_FTR_LOCKLESS_TLBIE);
 
99
        unsigned int use_local = local && mmu_has_feature(MMU_FTR_TLBIEL);
 
100
        int lock_tlbie = !mmu_has_feature(MMU_FTR_LOCKLESS_TLBIE);
103
101
 
104
102
        if (use_local)
105
103
                use_local = mmu_psize_defs[psize].tlbiel;
503
501
                } pte_iterate_hashed_end();
504
502
        }
505
503
 
506
 
        if (cpu_has_feature(CPU_FTR_TLBIEL) &&
 
504
        if (mmu_has_feature(MMU_FTR_TLBIEL) &&
507
505
            mmu_psize_defs[psize].tlbiel && local) {
508
506
                asm volatile("ptesync":::"memory");
509
507
                for (i = 0; i < number; i++) {
517
515
                }
518
516
                asm volatile("ptesync":::"memory");
519
517
        } else {
520
 
                int lock_tlbie = !cpu_has_feature(CPU_FTR_LOCKLESS_TLBIE);
 
518
                int lock_tlbie = !mmu_has_feature(MMU_FTR_LOCKLESS_TLBIE);
521
519
 
522
520
                if (lock_tlbie)
523
521
                        raw_spin_lock(&native_tlbie_lock);