← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to arch/blackfin/mm/init.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/blackfin/mm/init.c
48
48
 
49
49
        unsigned long zones_size[MAX_NR_ZONES] = {
50
50
                [0] = 0,
51
 
                [ZONE_DMA] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT,
 
51
                [ZONE_DMA] = (end_mem - CONFIG_PHY_RAM_BASE_ADDRESS) >> PAGE_SHIFT,
52
52
                [ZONE_NORMAL] = 0,
53
53
#ifdef CONFIG_HIGHMEM
54
54
                [ZONE_HIGHMEM] = 0,
60
60
 
61
61
        pr_debug("free_area_init -> start_mem is %#lx virtual_end is %#lx\n",
62
62
                PAGE_ALIGN(memory_start), end_mem);
63
 
        free_area_init(zones_size);
 
63
        free_area_init_node(0, zones_size,
 
64
                CONFIG_PHY_RAM_BASE_ADDRESS >> PAGE_SHIFT, NULL);
64
65
}
65
66
 
66
67
asmlinkage void __init init_pda(void)
75
76
           valid pointers to it. */
76
77
        memset(&cpu_pda[cpu], 0, sizeof(cpu_pda[cpu]));
77
78
 
78
 
        cpu_pda[0].next = &cpu_pda[1];
79
 
        cpu_pda[1].next = &cpu_pda[0];
80
 
 
81
79
#ifdef CONFIG_EXCEPTION_L1_SCRATCH
82
80
        cpu_pda[cpu].ex_stack = (unsigned long *)(L1_SCRATCH_START + \
83
81
                                        L1_SCRATCH_LENGTH);
109
107
        totalram_pages = free_all_bootmem();
110
108
 
111
109
        reservedpages = 0;
112
 
        for (tmp = 0; tmp < max_mapnr; tmp++)
 
110
        for (tmp = ARCH_PFN_OFFSET; tmp < max_mapnr; tmp++)
113
111
                if (PageReserved(pfn_to_page(tmp)))
114
112
                        reservedpages++;
115
 
        freepages =  max_mapnr - reservedpages;
 
113
        freepages =  max_mapnr - ARCH_PFN_OFFSET - reservedpages;
116
114
 
117
115
        /* do not count in kernel image between _rambase and _ramstart */
118
116
        reservedpages -= (_ramstart - _rambase) >> PAGE_SHIFT;
127
125
        printk(KERN_INFO
128
126
             "Memory available: %luk/%luk RAM, "
129
127
                "(%uk init code, %uk kernel code, %uk data, %uk dma, %uk reserved)\n",
130
 
                (unsigned long) freepages << (PAGE_SHIFT-10), _ramend >> 10,
 
128
                (unsigned long) freepages << (PAGE_SHIFT-10), (_ramend - CONFIG_PHY_RAM_BASE_ADDRESS) >> 10,
131
129
                initk, codek, datak, DMA_UNCACHED_REGION >> 10, (reservedpages << (PAGE_SHIFT-10)));
132
130
}
133
131