Merge branch 'x86/apic' into x86/core

diff --cc arch/x86/kernel/apic_32.c
Simple merge

diff --cc arch/x86/kernel/apic_64.c
Simple merge

diff --cc arch/x86/kernel/io_apic_32.c
index a0f4c27c822da91ed4630809b3b726606e4f65e9,d54455ec985039b6cb079a73d718fc8e0cc2e8bf..e710289f673e86503d1ba9d77e1770e3559c1ccd
--- 1/arch/x86/kernel/io_apic_32.c
--- 2/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
@@@ -1480,10 -1484,9 +1481,10 @@@ __apicdebuginit(void) print_APIC_bitfie
        }
  }
  
- void /*__init*/ print_local_APIC(void *dummy)
+ __apicdebuginit(void) print_local_APIC(void *dummy)
  {
        unsigned int v, ver, maxlvt;
 +      u64 icr;
  
        if (apic_verbosity == APIC_QUIET)
                return;

diff --cc arch/x86/kernel/io_apic_64.c
index e63282e788640402828dc17cf641a9a8c71c003a,8cdcc4f287cc399c1ffa3c8182cbbd4e38c4b45f..a1bec2969c6af666d9566ba9a3ba5bcef0a34ee0
--- 1/arch/x86/kernel/io_apic_64.c
--- 2/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@@ -1234,10 -1081,9 +1233,10 @@@ __apicdebuginit(void) print_APIC_bitfie
        }
  }
  
- void __apicdebuginit print_local_APIC(void * dummy)
+ __apicdebuginit(void) print_local_APIC(void *dummy)
  {
        unsigned int v, ver, maxlvt;
 +      unsigned long icr;
  
        if (apic_verbosity == APIC_QUIET)
                return;

diff --cc include/asm-x86/hw_irq.h
Simple merge