aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-05 14:36:31 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-05 14:36:31 -0400
commitea431793f198e26d1553f36ed8b5a830b531eee4 (patch)
treeb97d79adee8cef49c65b0be96aa38d17f4005e18 /arch/cris
parent32fb6c17566ec66de87324a834c7776f40e35e78 (diff)
parent276e79ee6b3ff670dc9c041178da4b61af456a27 (diff)
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
* 'for-linus' of git://repo.or.cz/cris-mirror: CRISv32: Remove extraneous space between -I and the path. cris: convert obsolete hw_interrupt_type to struct irq_chip BUG to BUG_ON changes cpumask: use mm_cpumask() wrapper: cris cpumask: Use accessors code.: cris cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: cris
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v10/kernel/irq.c2
-rw-r--r--arch/cris/arch-v32/boot/compressed/Makefile6
-rw-r--r--arch/cris/arch-v32/kernel/irq.c2
-rw-r--r--arch/cris/arch-v32/kernel/smp.c10
-rw-r--r--arch/cris/arch-v32/mm/tlb.c2
-rw-r--r--arch/cris/kernel/setup.c2
-rw-r--r--arch/cris/mm/init.c3
7 files changed, 13 insertions, 14 deletions
diff --git a/arch/cris/arch-v10/kernel/irq.c b/arch/cris/arch-v10/kernel/irq.c
index 65ed803dae6f..5d75f77f9c73 100644
--- a/arch/cris/arch-v10/kernel/irq.c
+++ b/arch/cris/arch-v10/kernel/irq.c
@@ -132,7 +132,7 @@ static void end_crisv10_irq(unsigned int irq)
132{ 132{
133} 133}
134 134
135static struct hw_interrupt_type crisv10_irq_type = { 135static struct irq_chip crisv10_irq_type = {
136 .typename = "CRISv10", 136 .typename = "CRISv10",
137 .startup = startup_crisv10_irq, 137 .startup = startup_crisv10_irq,
138 .shutdown = shutdown_crisv10_irq, 138 .shutdown = shutdown_crisv10_irq,
diff --git a/arch/cris/arch-v32/boot/compressed/Makefile b/arch/cris/arch-v32/boot/compressed/Makefile
index 5a1b31c99eaa..e176b8b69d92 100644
--- a/arch/cris/arch-v32/boot/compressed/Makefile
+++ b/arch/cris/arch-v32/boot/compressed/Makefile
@@ -2,9 +2,9 @@
2# arch/cris/arch-v32/boot/compressed/Makefile 2# arch/cris/arch-v32/boot/compressed/Makefile
3# 3#
4 4
5asflags-y += -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch 5asflags-y += -I$(srctree)/include/asm/mach/ -I$(srctree)/include/asm/arch
6ccflags-y += -O2 -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch 6ccflags-y += -O2 -I$(srctree)/include/asm/mach/ -I$(srctree)/include/asm/arch
7ldflags-y += -T $(srctree)/$(src)/decompress.lds 7ldflags-y += -T$(srctree)/$(src)/decompress.lds
8OBJECTS = $(obj)/head.o $(obj)/misc.o 8OBJECTS = $(obj)/head.o $(obj)/misc.o
9OBJCOPYFLAGS = -O binary --remove-section=.bss 9OBJCOPYFLAGS = -O binary --remove-section=.bss
10 10
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index 295131fee710..df3925cb1c7f 100644
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -333,7 +333,7 @@ void set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest)
333 spin_unlock_irqrestore(&irq_lock, flags); 333 spin_unlock_irqrestore(&irq_lock, flags);
334} 334}
335 335
336static struct hw_interrupt_type crisv32_irq_type = { 336static struct irq_chip crisv32_irq_type = {
337 .typename = "CRISv32", 337 .typename = "CRISv32",
338 .startup = startup_crisv32_irq, 338 .startup = startup_crisv32_irq,
339 .shutdown = shutdown_crisv32_irq, 339 .shutdown = shutdown_crisv32_irq,
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
index f59a973c97ee..d2a3ff8c4d37 100644
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@ -97,9 +97,9 @@ void __devinit smp_prepare_boot_cpu(void)
97 SUPP_BANK_SEL(2); 97 SUPP_BANK_SEL(2);
98 SUPP_REG_WR(RW_MM_TLB_PGD, pgd); 98 SUPP_REG_WR(RW_MM_TLB_PGD, pgd);
99 99
100 cpu_set(0, cpu_online_map); 100 set_cpu_online(0, true);
101 cpu_set(0, phys_cpu_present_map); 101 cpu_set(0, phys_cpu_present_map);
102 cpu_set(0, cpu_possible_map); 102 set_cpu_possible(0, true);
103} 103}
104 104
105void __init smp_cpus_done(unsigned int max_cpus) 105void __init smp_cpus_done(unsigned int max_cpus)
@@ -231,7 +231,7 @@ void flush_tlb_common(struct mm_struct* mm, struct vm_area_struct* vma, unsigned
231 cpumask_t cpu_mask; 231 cpumask_t cpu_mask;
232 232
233 spin_lock_irqsave(&tlbstate_lock, flags); 233 spin_lock_irqsave(&tlbstate_lock, flags);
234 cpu_mask = (mm == FLUSH_ALL ? CPU_MASK_ALL : mm->cpu_vm_mask); 234 cpu_mask = (mm == FLUSH_ALL ? cpu_all_mask : *mm_cpumask(mm));
235 cpu_clear(smp_processor_id(), cpu_mask); 235 cpu_clear(smp_processor_id(), cpu_mask);
236 flush_mm = mm; 236 flush_mm = mm;
237 flush_vma = vma; 237 flush_vma = vma;
@@ -251,8 +251,8 @@ void flush_tlb_mm(struct mm_struct *mm)
251 __flush_tlb_mm(mm); 251 __flush_tlb_mm(mm);
252 flush_tlb_common(mm, FLUSH_ALL, 0); 252 flush_tlb_common(mm, FLUSH_ALL, 0);
253 /* No more mappings in other CPUs */ 253 /* No more mappings in other CPUs */
254 cpus_clear(mm->cpu_vm_mask); 254 cpumask_clear(mm_cpumask(mm));
255 cpu_set(smp_processor_id(), mm->cpu_vm_mask); 255 cpumask_set_cpu(smp_processor_id(), mm_cpumask(mm));
256} 256}
257 257
258void flush_tlb_page(struct vm_area_struct *vma, 258void flush_tlb_page(struct vm_area_struct *vma,
diff --git a/arch/cris/arch-v32/mm/tlb.c b/arch/cris/arch-v32/mm/tlb.c
index 55ade36fe8a8..6779bcb28ab0 100644
--- a/arch/cris/arch-v32/mm/tlb.c
+++ b/arch/cris/arch-v32/mm/tlb.c
@@ -185,7 +185,7 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,
185 /* Make sure there is a MMU context. */ 185 /* Make sure there is a MMU context. */
186 spin_lock(&mmu_context_lock); 186 spin_lock(&mmu_context_lock);
187 get_mmu_context(next); 187 get_mmu_context(next);
188 cpu_set(cpu, next->cpu_vm_mask); 188 cpumask_set_cpu(cpu, mm_cpumask(next));
189 spin_unlock(&mmu_context_lock); 189 spin_unlock(&mmu_context_lock);
190 190
191 /* 191 /*
diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c
index 04d48dd91ddf..b712f4934c4b 100644
--- a/arch/cris/kernel/setup.c
+++ b/arch/cris/kernel/setup.c
@@ -166,7 +166,7 @@ void __init setup_arch(char **cmdline_p)
166 166
167static void *c_start(struct seq_file *m, loff_t *pos) 167static void *c_start(struct seq_file *m, loff_t *pos)
168{ 168{
169 return *pos < NR_CPUS ? (void *)(int)(*pos + 1): NULL; 169 return *pos < nr_cpu_ids ? (void *)(int)(*pos + 1) : NULL;
170} 170}
171 171
172static void *c_next(struct seq_file *m, void *v, loff_t *pos) 172static void *c_next(struct seq_file *m, void *v, loff_t *pos)
diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c
index 2fdd212eb250..514f46a4b230 100644
--- a/arch/cris/mm/init.c
+++ b/arch/cris/mm/init.c
@@ -25,8 +25,7 @@ mem_init(void)
25 int codesize, reservedpages, datasize, initsize; 25 int codesize, reservedpages, datasize, initsize;
26 unsigned long tmp; 26 unsigned long tmp;
27 27
28 if(!mem_map) 28 BUG_ON(!mem_map);
29 BUG();
30 29
31 /* max/min_low_pfn was set by setup.c 30 /* max/min_low_pfn was set by setup.c
32 * now we just copy it to some other necessary places... 31 * now we just copy it to some other necessary places...