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

Commit 532bfc85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (Andrew's patch-bomb) 

Merge third batch of patches from Andrew Morton:
 - Some MM stragglers
 - core SMP library cleanups (on_each_cpu_mask)
 - Some IPI optimisations
 - kexec
 - kdump
 - IPMI
 - the radix-tree iterator work
 - various other misc bits.

 "That'll do for -rc1.  I still have ~10 patches for 3.4, will send
  those along when they've baked a little more."

* emailed from Andrew Morton <akpm@linux-foundation.org>: (35 commits)
  backlight: fix typo in tosa_lcd.c
  crc32: add help text for the algorithm select option
  mm: move hugepage test examples to tools/testing/selftests/vm
  mm: move slabinfo.c to tools/vm
  mm: move page-types.c from Documentation to tools/vm
  selftests/Makefile: make `run_tests' depend on `all'
  selftests: launch individual selftests from the main Makefile
  radix-tree: use iterators in find_get_pages* functions
  radix-tree: rewrite gang lookup using iterator
  radix-tree: introduce bit-optimized iterator
  fs/proc/namespaces.c: prevent crash when ns_entries[] is empty
  nbd: rename the nbd_device variable from lo to nbd
  pidns: add reboot_pid_ns() to handle the reboot syscall
  sysctl: use bitmap library functions
  ipmi: use locks on watchdog timeout set on reboot
  ipmi: simplify locking
  ipmi: fix message handling during panics
  ipmi: use a tasklet for handling received messages
  ipmi: increase KCS timeouts
  ipmi: decrease the IPMI message transaction time in interrupt mode
  ...
parents 0195c002 8da00edc

Documentation/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-m := DocBook/ accounting/ auxdisplay/ connector/ \

	filesystems/ filesystems/configfs/ ia64/ laptops/ networking/ \

	pcmcia/ spi/ timers/ vm/ watchdog/src/
 
	pcmcia/ spi/ timers/ watchdog/src/

Documentation/vm/Makefile

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
# kbuild trick to avoid linker error. Can be omitted if a module is built.

obj- := dummy.o



# List of programs to build

hostprogs-y := page-types hugepage-mmap hugepage-shm map_hugetlb



# Tell kbuild to always build the programs

always := $(hostprogs-y)

arch/arm/kernel/smp_tlb.c

+5 −15
Original line number Diff line number Diff line
@@ -13,18 +13,6 @@ 
#include <asm/smp_plat.h>

#include <asm/tlbflush.h>



static void on_each_cpu_mask(void (*func)(void *), void *info, int wait,

	const struct cpumask *mask)

{

	preempt_disable();



	smp_call_function_many(mask, func, info, wait);

	if (cpumask_test_cpu(smp_processor_id(), mask))

		func(info);



	preempt_enable();

}



/**********************************************************************/



/*
@@ -87,7 +75,7 @@ void flush_tlb_all(void) 
void flush_tlb_mm(struct mm_struct *mm)

{

	if (tlb_ops_need_broadcast())

		on_each_cpu_mask(ipi_flush_tlb_mm, mm, 1, mm_cpumask(mm));

		on_each_cpu_mask(mm_cpumask(mm), ipi_flush_tlb_mm, mm, 1);

	else

		local_flush_tlb_mm(mm);

}
@@ -98,7 +86,8 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr) 
		struct tlb_args ta;

		ta.ta_vma = vma;

		ta.ta_start = uaddr;

		on_each_cpu_mask(ipi_flush_tlb_page, &ta, 1, mm_cpumask(vma->vm_mm));

		on_each_cpu_mask(mm_cpumask(vma->vm_mm), ipi_flush_tlb_page,

					&ta, 1);

	} else

		local_flush_tlb_page(vma, uaddr);

}
@@ -121,7 +110,8 @@ void flush_tlb_range(struct vm_area_struct *vma, 
		ta.ta_vma = vma;

		ta.ta_start = start;

		ta.ta_end = end;

		on_each_cpu_mask(ipi_flush_tlb_range, &ta, 1, mm_cpumask(vma->vm_mm));

		on_each_cpu_mask(mm_cpumask(vma->vm_mm), ipi_flush_tlb_range,

					&ta, 1);

	} else

		local_flush_tlb_range(vma, start, end);

}

arch/ia64/kernel/acpi.c

+3 −3
Original line number Diff line number Diff line
@@ -843,7 +843,7 @@ early_param("additional_cpus", setup_additional_cpus); 
 * are onlined, or offlined. The reason is per-cpu data-structures

 * are allocated by some modules at init time, and dont expect to

 * do this dynamically on cpu arrival/departure.

 * cpu_present_map on the other hand can change dynamically.

 * cpu_present_mask on the other hand can change dynamically.

 * In case when cpu_hotplug is not compiled, then we resort to current

 * behaviour, which is cpu_possible == cpu_present.

 * - Ashok Raj
@@ -921,7 +921,7 @@ static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu) 


	acpi_map_cpu2node(handle, cpu, physid);



	cpu_set(cpu, cpu_present_map);

	set_cpu_present(cpu, true);

	ia64_cpu_to_sapicid[cpu] = physid;



	acpi_processor_set_pdc(handle);
@@ -940,7 +940,7 @@ EXPORT_SYMBOL(acpi_map_lsapic); 
int acpi_unmap_lsapic(int cpu)

{

	ia64_cpu_to_sapicid[cpu] = -1;

	cpu_clear(cpu, cpu_present_map);

	set_cpu_present(cpu, false);



#ifdef CONFIG_ACPI_NUMA

	/* NUMA specific cleanup's */

arch/ia64/kernel/irq_ia64.c

+4 −4
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static inline int find_unassigned_vector(cpumask_t domain) 
	cpumask_t mask;

	int pos, vector;



	cpus_and(mask, domain, cpu_online_map);

	cpumask_and(&mask, &domain, cpu_online_mask);

	if (cpus_empty(mask))

		return -EINVAL;
@@ -140,7 +140,7 @@ static int __bind_irq_vector(int irq, int vector, cpumask_t domain) 
	BUG_ON((unsigned)irq >= NR_IRQS);

	BUG_ON((unsigned)vector >= IA64_NUM_VECTORS);



	cpus_and(mask, domain, cpu_online_map);

	cpumask_and(&mask, &domain, cpu_online_mask);

	if (cpus_empty(mask))

		return -EINVAL;

	if ((cfg->vector == vector) && cpus_equal(cfg->domain, domain))
@@ -178,7 +178,7 @@ static void __clear_irq_vector(int irq) 
	BUG_ON(cfg->vector == IRQ_VECTOR_UNASSIGNED);

	vector = cfg->vector;

	domain = cfg->domain;

	cpus_and(mask, cfg->domain, cpu_online_map);

	cpumask_and(&mask, &cfg->domain, cpu_online_mask);

	for_each_cpu_mask(cpu, mask)

		per_cpu(vector_irq, cpu)[vector] = -1;

	cfg->vector = IRQ_VECTOR_UNASSIGNED;
@@ -321,7 +321,7 @@ void irq_complete_move(unsigned irq) 
	if (unlikely(cpu_isset(smp_processor_id(), cfg->old_domain)))

		return;



	cpus_and(cleanup_mask, cfg->old_domain, cpu_online_map);

	cpumask_and(&cleanup_mask, &cfg->old_domain, cpu_online_mask);

	cfg->move_cleanup_count = cpus_weight(cleanup_mask);

	for_each_cpu_mask(i, cleanup_mask)

		platform_send_ipi(i, IA64_IRQ_MOVE_VECTOR, IA64_IPI_DM_INT, 0);