Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea431793 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 32fb6c17 276e79ee

arch/cris/arch-v10/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static void end_crisv10_irq(unsigned int irq) 
{

}



static struct hw_interrupt_type crisv10_irq_type = {

static struct irq_chip crisv10_irq_type = {

	.typename =    "CRISv10",

	.startup =     startup_crisv10_irq,

	.shutdown =    shutdown_crisv10_irq,

arch/cris/arch-v32/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ void set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest) 
	spin_unlock_irqrestore(&irq_lock, flags);

}



static struct hw_interrupt_type crisv32_irq_type = {

static struct irq_chip crisv32_irq_type = {

	.typename =    "CRISv32",

	.startup =     startup_crisv32_irq,

	.shutdown =    shutdown_crisv32_irq,

arch/cris/arch-v32/kernel/smp.c

+5 −5
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ void __devinit smp_prepare_boot_cpu(void) 
	SUPP_BANK_SEL(2);

	SUPP_REG_WR(RW_MM_TLB_PGD, pgd);



	cpu_set(0, cpu_online_map);

	set_cpu_online(0, true);

	cpu_set(0, phys_cpu_present_map);

	cpu_set(0, cpu_possible_map);

	set_cpu_possible(0, true);

}



void __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 
	cpumask_t cpu_mask;



	spin_lock_irqsave(&tlbstate_lock, flags);

	cpu_mask = (mm == FLUSH_ALL ? CPU_MASK_ALL : mm->cpu_vm_mask);

	cpu_mask = (mm == FLUSH_ALL ? cpu_all_mask : *mm_cpumask(mm));

	cpu_clear(smp_processor_id(), cpu_mask);

	flush_mm = mm;

	flush_vma = vma;
@@ -251,8 +251,8 @@ void flush_tlb_mm(struct mm_struct *mm) 
	__flush_tlb_mm(mm);

	flush_tlb_common(mm, FLUSH_ALL, 0);

	/* No more mappings in other CPUs */

	cpus_clear(mm->cpu_vm_mask);

	cpu_set(smp_processor_id(), mm->cpu_vm_mask);

	cpumask_clear(mm_cpumask(mm));

	cpumask_set_cpu(smp_processor_id(), mm_cpumask(mm));

}



void flush_tlb_page(struct vm_area_struct *vma,

arch/cris/arch-v32/mm/tlb.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next, 
		/* Make sure there is a MMU context. */

		spin_lock(&mmu_context_lock);

		get_mmu_context(next);

		cpu_set(cpu, next->cpu_vm_mask);

		cpumask_set_cpu(cpu, mm_cpumask(next));

		spin_unlock(&mmu_context_lock);



		/*

arch/cris/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ void __init setup_arch(char **cmdline_p) 


static void *c_start(struct seq_file *m, loff_t *pos)

{

	return *pos < NR_CPUS ? (void *)(int)(*pos + 1): NULL;

	return *pos < nr_cpu_ids ? (void *)(int)(*pos + 1) : NULL;

}



static void *c_next(struct seq_file *m, void *v, loff_t *pos)