Pair of ia64 cleanups
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVjbbrAAoJEKurIx+X31iBGbIP/j5fzf73ekHoZqtA4/2oy533 YnT2b8Mnl30GqUhLub9bc1UIU9qu0YABxZSIMPCKiqNNDJIcVyNZhVhYpIbZnVXV L7v/yQxNMEEniOYrVbBZWaYnI9O6SvvOhBj0NXDiA7+VFJuzK6UrpV1ZajIl/mh2 gfarD0FyDLaMPIyjmVNnRDSftDRGwlAW7Ea9Z8PSRLDB2OH+3yZpePDqpQOVrbSZ dlqE/c75XrwYaFKU3VHsHiUhfeygiuNo4V9naZxgAcAxs7H8Zfkgt6QhhSlblpBp 8yIdo+cBzrLOmA7HdmXtKROM9cZTfr9CfJglq7tbfIZ7xY76pRw8mDXaq8/9/iXr aFpsbc00O9U3lOvDxe9P9DYbZeYkb50oHbbvkKxGbJ6jCVhaZ3axfSXT1xVx5+Mc OfZKqLFkUNYZnzI359tSEK0uVVaucVMl/tsQi47xQ055BTy/fyuaISinU4AretVx CLnFB8insa6Yf9WkYFs3Hys3HoEokOW4MVuBoIeumAoSLUaO3uljog4vcZ+cVBRc hSXlJpxQMIZIcIQVWNXhr5Cg/eempGFPnvNqduJEKq2VHWvbM2+brx2+CCOW9cSw eaQI6Il1EJeU2aOsur0VSMjYBqxXSExtWxUvLNTkI/mklidIM1w5m8ug0YEmKHj9 ii5wDfsb1vp4xxN1/R0f =H/9f -----END PGP SIGNATURE----- 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
This commit is contained in:
Коммит
f199b663fc
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче