xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2015-06-29 09:25:14 -07:00
parent d93a74a91b 2587dc65e1
commit f199b663fc
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/ia64/kernel/ia64_ksyms.c
View File

@@ -96,3 +96,6 @@ EXPORT_SYMBOL(ia64_ivt);
/* mcount is defined in assembly */ /* mcount is defined in assembly */
EXPORT_SYMBOL(_mcount); EXPORT_SYMBOL(_mcount);
#endif #endif
#include <asm/cacheflush.h>
EXPORT_SYMBOL_GPL(flush_icache_range);

6
arch/ia64/kernel/mca.c
View File

@@ -2117,8 +2117,7 @@ ia64_mca_late_init(void)
register_hotcpu_notifier(&mca_cpu_notifier); register_hotcpu_notifier(&mca_cpu_notifier);
/* Setup the CMCI/P vector and handler */ /* Setup the CMCI/P vector and handler */
init_timer(&cmc_poll_timer); setup_timer(&cmc_poll_timer, ia64_mca_cmc_poll, 0UL);
cmc_poll_timer.function = ia64_mca_cmc_poll;
/* Unmask/enable the vector */ /* Unmask/enable the vector */
cmc_polling_enabled = 0; cmc_polling_enabled = 0;
@@ -2129,8 +2128,7 @@ ia64_mca_late_init(void)
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
/* Setup the CPEI/P vector and handler */ /* Setup the CPEI/P vector and handler */
cpe_vector = acpi_request_vector(ACPI_INTERRUPT_CPEI); cpe_vector = acpi_request_vector(ACPI_INTERRUPT_CPEI);
init_timer(&cpe_poll_timer); setup_timer(&cpe_poll_timer, ia64_mca_cpe_poll, 0UL);
cpe_poll_timer.function = ia64_mca_cpe_poll;
{ {
unsigned int irq; unsigned int irq;