← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/alpha/kernel/sys_titan.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/alpha/kernel/sys_titan.c
65
65
        register int bcpu = boot_cpuid;
66
66
 
67
67
#ifdef CONFIG_SMP
68
 
        cpumask_t cpm = cpu_present_map;
 
68
        cpumask_t cpm;
69
69
        volatile unsigned long *dim0, *dim1, *dim2, *dim3;
70
70
        unsigned long mask0, mask1, mask2, mask3, dummy;
71
71
 
 
72
        cpumask_copy(&cpm, cpu_present_mask);
72
73
        mask &= ~isa_enable;
73
74
        mask0 = mask & titan_cpu_irq_affinity[0];
74
75
        mask1 = mask & titan_cpu_irq_affinity[1];
84
85
        dim1 = &cchip->dim1.csr;
85
86
        dim2 = &cchip->dim2.csr;
86
87
        dim3 = &cchip->dim3.csr;
87
 
        if (!cpu_isset(0, cpm)) dim0 = &dummy;
88
 
        if (!cpu_isset(1, cpm)) dim1 = &dummy;
89
 
        if (!cpu_isset(2, cpm)) dim2 = &dummy;
90
 
        if (!cpu_isset(3, cpm)) dim3 = &dummy;
 
88
        if (!cpumask_test_cpu(0, &cpm)) dim0 = &dummy;
 
89
        if (!cpumask_test_cpu(1, &cpm)) dim1 = &dummy;
 
90
        if (!cpumask_test_cpu(2, &cpm)) dim2 = &dummy;
 
91
        if (!cpumask_test_cpu(3, &cpm)) dim3 = &dummy;
91
92
 
92
93
        *dim0 = mask0;
93
94
        *dim1 = mask1;
137
138
        int cpu;
138
139
 
139
140
        for (cpu = 0; cpu < 4; cpu++) {
140
 
                if (cpu_isset(cpu, affinity))
 
141
                if (cpumask_test_cpu(cpu, &affinity))
141
142
                        titan_cpu_irq_affinity[cpu] |= 1UL << irq;
142
143
                else
143
144
                        titan_cpu_irq_affinity[cpu] &= ~(1UL << irq);
179
180
{
180
181
        long i;
181
182
        for (i = imin; i <= imax; ++i) {
182
 
                set_irq_chip_and_handler(i, ops, handle_level_irq);
 
183
                irq_set_chip_and_handler(i, ops, handle_level_irq);
183
184
                irq_set_status_flags(i, IRQ_LEVEL);
184
185
        }
185
186
}