Commit 94a8d5ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (39 commits)
  cpumask: Move deprecated functions to end of header.
  cpumask: remove unused deprecated functions, avoid accusations of insanity
  cpumask: use new-style cpumask ops in mm/quicklist.
  cpumask: use mm_cpumask() wrapper: x86
  cpumask: use mm_cpumask() wrapper: um
  cpumask: use mm_cpumask() wrapper: mips
  cpumask: use mm_cpumask() wrapper: mn10300
  cpumask: use mm_cpumask() wrapper: m32r
  cpumask: use mm_cpumask() wrapper: arm
  cpumask: Use accessors for cpu_*_mask: um
  cpumask: Use accessors for cpu_*_mask: powerpc
  cpumask: Use accessors for cpu_*_mask: mips
  cpumask: Use accessors for cpu_*_mask: m32r
  cpumask: remove arch_send_call_function_ipi
  cpumask: arch_send_call_function_ipi_mask: s390
  cpumask: arch_send_call_function_ipi_mask: powerpc
  cpumask: arch_send_call_function_ipi_mask: mips
  cpumask: arch_send_call_function_ipi_mask: m32r
  cpumask: arch_send_call_function_ipi_mask: alpha
  cpumask: remove obsolete topology_core_siblings and topology_thread_siblings: ia64
  ...
parents 2bcd57ab 6ba2ef7b

arch/alpha/include/asm/smp.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ extern struct cpuinfo_alpha cpu_data[NR_CPUS]; 
extern int smp_num_cpus;



extern void arch_send_call_function_single_ipi(int cpu);

extern void arch_send_call_function_ipi(cpumask_t mask);

extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);



#else /* CONFIG_SMP */

arch/alpha/include/asm/topology.h

+0 −18
Original line number Diff line number Diff line
@@ -22,23 +22,6 @@ static inline int cpu_to_node(int cpu) 
	return node;

}



static inline cpumask_t node_to_cpumask(int node)

{

	cpumask_t node_cpu_mask = CPU_MASK_NONE;

	int cpu;



	for_each_online_cpu(cpu) {

		if (cpu_to_node(cpu) == node)

			cpu_set(cpu, node_cpu_mask);

	}



#ifdef DEBUG_NUMA

	printk("node %d: cpu_mask: %016lx\n", node, node_cpu_mask);

#endif



	return node_cpu_mask;

}



extern struct cpumask node_to_cpumask_map[];

/* FIXME: This is dumb, recalculating every time.  But simple. */

static const struct cpumask *cpumask_of_node(int node)
@@ -55,7 +38,6 @@ static const struct cpumask *cpumask_of_node(int node) 
	return &node_to_cpumask_map[node];

}



#define pcibus_to_cpumask(bus)	(cpu_online_map)

#define cpumask_of_pcibus(bus)	(cpu_online_mask)



#endif /* !CONFIG_NUMA */

arch/alpha/kernel/smp.c

+7 −7
Original line number Diff line number Diff line
@@ -548,16 +548,16 @@ setup_profiling_timer(unsigned int multiplier) 




static void

send_ipi_message(cpumask_t to_whom, enum ipi_message_type operation)

send_ipi_message(const struct cpumask *to_whom, enum ipi_message_type operation)

{

	int i;



	mb();

	for_each_cpu_mask(i, to_whom)

	for_each_cpu(i, to_whom)

		set_bit(operation, &ipi_data[i].bits);



	mb();

	for_each_cpu_mask(i, to_whom)

	for_each_cpu(i, to_whom)

		wripir(i);

}
@@ -624,7 +624,7 @@ smp_send_reschedule(int cpu) 
		printk(KERN_WARNING

		       "smp_send_reschedule: Sending IPI to self.\n");

#endif

	send_ipi_message(cpumask_of_cpu(cpu), IPI_RESCHEDULE);

	send_ipi_message(cpumask_of(cpu), IPI_RESCHEDULE);

}



void
@@ -636,17 +636,17 @@ smp_send_stop(void) 
	if (hard_smp_processor_id() != boot_cpu_id)

		printk(KERN_WARNING "smp_send_stop: Not on boot cpu.\n");

#endif

	send_ipi_message(to_whom, IPI_CPU_STOP);

	send_ipi_message(&to_whom, IPI_CPU_STOP);

}



void arch_send_call_function_ipi(cpumask_t mask)

void arch_send_call_function_ipi_mask(const struct cpumask *mask)

{

	send_ipi_message(mask, IPI_CALL_FUNC);

}



void arch_send_call_function_single_ipi(int cpu)

{

	send_ipi_message(cpumask_of_cpu(cpu), IPI_CALL_FUNC_SINGLE);

	send_ipi_message(cpumask_of(cpu), IPI_CALL_FUNC_SINGLE);

}



static void

arch/arm/include/asm/cacheflush.h

+4 −4
Original line number Diff line number Diff line
@@ -334,14 +334,14 @@ static inline void outer_flush_range(unsigned long start, unsigned long end) 
#ifndef CONFIG_CPU_CACHE_VIPT

static inline void flush_cache_mm(struct mm_struct *mm)

{

	if (cpu_isset(smp_processor_id(), mm->cpu_vm_mask))

	if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(mm)))

		__cpuc_flush_user_all();

}



static inline void

flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long end)

{

	if (cpu_isset(smp_processor_id(), vma->vm_mm->cpu_vm_mask))

	if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm)))

		__cpuc_flush_user_range(start & PAGE_MASK, PAGE_ALIGN(end),

					vma->vm_flags);

}
@@ -349,7 +349,7 @@ flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long 
static inline void

flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsigned long pfn)

{

	if (cpu_isset(smp_processor_id(), vma->vm_mm->cpu_vm_mask)) {

	if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm))) {

		unsigned long addr = user_addr & PAGE_MASK;

		__cpuc_flush_user_range(addr, addr + PAGE_SIZE, vma->vm_flags);

	}
@@ -360,7 +360,7 @@ flush_ptrace_access(struct vm_area_struct *vma, struct page *page, 
			 unsigned long uaddr, void *kaddr,

			 unsigned long len, int write)

{

	if (cpu_isset(smp_processor_id(), vma->vm_mm->cpu_vm_mask)) {

	if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm))) {

		unsigned long addr = (unsigned long)kaddr;

		__cpuc_coherent_kern_range(addr, addr + len);

	}

arch/arm/include/asm/mmu_context.h

+4 −3
Original line number Diff line number Diff line
@@ -103,14 +103,15 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next, 


#ifdef CONFIG_SMP

	/* check for possible thread migration */

	if (!cpus_empty(next->cpu_vm_mask) && !cpu_isset(cpu, next->cpu_vm_mask))

	if (!cpumask_empty(mm_cpumask(next)) &&

	    !cpumask_test_cpu(cpu, mm_cpumask(next)))

		__flush_icache_all();

#endif

	if (!cpu_test_and_set(cpu, next->cpu_vm_mask) || prev != next) {

	if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next)) || prev != next) {

		check_context(next);

		cpu_switch_mm(next->pgd, next);

		if (cache_is_vivt())

			cpu_clear(cpu, prev->cpu_vm_mask);

			cpumask_clear_cpu(cpu, mm_cpumask(prev));

	}

#endif

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE