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

Merge tag 'please-pull-misc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux 

Pull ia64 updates from Tony Luck:
 "Pair of ia64 cleanups"

* tag 'please-pull-misc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  ia64: Use setup_timer
  ia64: export flush_icache_range for module use
parents d93a74a9 2587dc65

arch/ia64/kernel/ia64_ksyms.c

+3 −0
Original line number Diff line number Diff line
@@ -96,3 +96,6 @@ EXPORT_SYMBOL(ia64_ivt); 
/* mcount is defined in assembly */

EXPORT_SYMBOL(_mcount);

#endif



#include <asm/cacheflush.h>

EXPORT_SYMBOL_GPL(flush_icache_range);

arch/ia64/kernel/mca.c

+2 −4
Original line number Diff line number Diff line
@@ -2117,8 +2117,7 @@ ia64_mca_late_init(void) 
	register_hotcpu_notifier(&mca_cpu_notifier);



	/* Setup the CMCI/P vector and handler */

	init_timer(&cmc_poll_timer);

	cmc_poll_timer.function = ia64_mca_cmc_poll;

	setup_timer(&cmc_poll_timer, ia64_mca_cmc_poll, 0UL);



	/* Unmask/enable the vector */

	cmc_polling_enabled = 0;
@@ -2129,8 +2128,7 @@ ia64_mca_late_init(void) 
#ifdef CONFIG_ACPI

	/* Setup the CPEI/P vector and handler */

	cpe_vector = acpi_request_vector(ACPI_INTERRUPT_CPEI);

	init_timer(&cpe_poll_timer);

	cpe_poll_timer.function = ia64_mca_cpe_poll;

	setup_timer(&cpe_poll_timer, ia64_mca_cpe_poll, 0UL);



	{

		unsigned int irq;