← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-linaro-u8500/precise

« back to all changes in this revision

Viewing changes to arch/x86/xen/mmu.c

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/xen/mmu.c
1651
1651
                for (pteidx = 0; pteidx < PTRS_PER_PTE; pteidx++, pfn++) {
1652
1652
                        pte_t pte;
1653
1653
 
1654
 
                        if (pfn > max_pfn_mapped)
1655
 
                                max_pfn_mapped = pfn;
1656
 
 
1657
1654
                        if (!pte_none(pte_page[pteidx]))
1658
1655
                                continue;
1659
1656
 
1711
1708
        pud_t *l3;
1712
1709
        pmd_t *l2;
1713
1710
 
 
1711
        /* max_pfn_mapped is the last pfn mapped in the initial memory
 
1712
         * mappings. Considering that on Xen after the kernel mappings we
 
1713
         * have the mappings of some pages that don't exist in pfn space, we
 
1714
         * set max_pfn_mapped to the last real pfn mapped. */
 
1715
        max_pfn_mapped = PFN_DOWN(__pa(xen_start_info->mfn_list));
 
1716
 
1714
1717
        /* Zap identity mapping */
1715
1718
        init_level4_pgt[0] = __pgd(0);
1716
1719
 
1815
1818
        initial_kernel_pmd =
1816
1819
                extend_brk(sizeof(pmd_t) * PTRS_PER_PMD, PAGE_SIZE);
1817
1820
 
1818
 
        max_pfn_mapped = PFN_DOWN(__pa(xen_start_info->pt_base) +
1819
 
                                  xen_start_info->nr_pt_frames * PAGE_SIZE +
1820
 
                                  512*1024);
 
1821
        max_pfn_mapped = PFN_DOWN(__pa(xen_start_info->mfn_list));
1821
1822
 
1822
1823
        kernel_pmd = m2v(pgd[KERNEL_PGD_BOUNDARY].pgd);
1823
1824
        memcpy(initial_kernel_pmd, kernel_pmd, sizeof(pmd_t) * PTRS_PER_PMD);