← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/powerpc/platforms/iseries/setup.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/powerpc/platforms/iseries/setup.c
249
249
        unsigned long i;
250
250
        unsigned long mem_blocks = 0;
251
251
 
252
 
        if (cpu_has_feature(CPU_FTR_SLB))
 
252
        if (mmu_has_feature(MMU_FTR_SLB))
253
253
                mem_blocks = iSeries_process_Regatta_mainstore_vpd(mb_array,
254
254
                                max_entries);
255
255
        else
634
634
 
635
635
        hpte_init_iSeries();
636
636
        /* iSeries does not support 16M pages */
637
 
        cur_cpu_spec->cpu_features &= ~CPU_FTR_16M_PAGE;
 
637
        cur_cpu_spec->mmu_features &= ~MMU_FTR_16M_PAGE;
638
638
 
639
639
        return 1;
640
640
}
685
685
        powerpc_firmware_features |= FW_FEATURE_ISERIES;
686
686
        powerpc_firmware_features |= FW_FEATURE_LPAR;
687
687
 
 
688
#ifdef CONFIG_SMP
 
689
        /* On iSeries we know we can never have more than 64 cpus */
 
690
        nr_cpu_ids = max(nr_cpu_ids, 64);
 
691
#endif
 
692
 
688
693
        iSeries_fixup_klimit();
689
694
 
690
695
        /*