From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 14 Aug 2008 13:13:47 +0000 (+0200)
Subject: Merge branch 'x86/apic' into x86/core
X-Git-Tag: v2.6.28-rc1~711^2~1^2~33^2~1
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=881b374705f352725ba1f558968ef34c17ba900e;p=linux-2.6-omap-h63xx.git

Merge branch 'x86/apic' into x86/core
---

881b374705f352725ba1f558968ef34c17ba900e
diff --cc arch/x86/kernel/io_apic_32.c
index a0f4c27c822,d54455ec985..e710289f673
--- a/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 e63282e7886,8cdcc4f287c..a1bec2969c6
--- a/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;