diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-29 09:25:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-29 09:25:14 -0700 |
| commit | f199b663fc5a276af10a49c24a83d8de27a41b53 (patch) | |
| tree | d3085992849284bf434517a73be5219587ac448e /arch | |
| parent | d93a74a91b847b8098ebae749891c6f4fe563da0 (diff) | |
| parent | 2587dc65e1b70617a1a369b26eb824ab1af1b9df (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/kernel/ia64_ksyms.c | 3 | ||||
| -rw-r--r-- | arch/ia64/kernel/mca.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c index 5b7791dd3965..096731049538 100644 --- a/arch/ia64/kernel/ia64_ksyms.c +++ b/arch/ia64/kernel/ia64_ksyms.c @@ -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); diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index dd5801eb4c69..2889412e03eb 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c @@ -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; |