From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 7 May 2011 08:51:38 +0000 (+0200)
Subject: Merge commit 'v2.6.39-rc6' into x86/cleanups
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~17811^4~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4cb1f43ce8c72ee453c00fcb9f6ee9c4ebd03f98;p=mirror_ubuntu-artful-kernel.git

Merge commit 'v2.6.39-rc6' into x86/cleanups

Merge reason: move to a (much) newer upstream base.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

4cb1f43ce8c72ee453c00fcb9f6ee9c4ebd03f98
diff --cc arch/x86/kernel/mpparse.c
index ef32d4c09c64,5a532ce646bf..ef59817357fc
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@@ -727,8 -725,12 +723,12 @@@ check_slot(unsigned long mpc_new_phys, 
  		return -1;
  	}
  
 -	return ret;
 +	return 0;
  }
+ #else /* CONFIG_X86_IO_APIC */
+ static
+ inline void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) {}
+ #endif /* CONFIG_X86_IO_APIC */
  
  static int  __init replace_intsrc_all(struct mpc_table *mpc,
  					unsigned long mpc_new_phys,