From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Jul 2012 19:19:36 +0000 (-0700)
Subject: Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.12-rc1~2744
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd3e57f9132ac55e2848aa10cf50341de2508e1d;p=kernel%2Fkernel-generic.git

Merge branch 'x86-platform-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 platform changes from Ingo Molnar:
 "This tree mostly involves various APIC driver cleanups/robustization,
  and vSMP motivated platform callback improvements/cleanups"

Fix up trivial conflict due to printk cleanup right next to return value
change.

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (29 commits)
  Revert "x86/early_printk: Replace obsolete simple_strtoul() usage with kstrtoint()"
  x86/apic/x2apic: Use multiple cluster members for the irq destination only with the explicit affinity
  x86/apic/x2apic: Limit the vector reservation to the user specified mask
  x86/apic: Optimize cpu traversal in __assign_irq_vector() using domain membership
  x86/vsmp: Fix vector_allocation_domain's return value
  irq/apic: Use config_enabled(CONFIG_SMP) checks to clean up irq_set_affinity() for UP
  x86/vsmp: Fix linker error when CONFIG_PROC_FS is not set
  x86/apic/es7000: Make apicid of a cluster (not CPU) from a cpumask
  x86/apic/es7000+summit: Always make valid apicid from a cpumask
  x86/apic/es7000+summit: Fix compile warning in cpu_mask_to_apicid()
  x86/apic: Fix ugly casting and branching in cpu_mask_to_apicid_and()
  x86/apic: Eliminate cpu_mask_to_apicid() operation
  x86/x2apic/cluster: Vector_allocation_domain() should return a value
  x86/apic/irq_remap: Silence a bogus pr_err()
  x86/vsmp: Ignore IOAPIC IRQ affinity if possible
  x86/apic: Make cpu_mask_to_apicid() operations check cpu_online_mask
  x86/apic: Make cpu_mask_to_apicid() operations return error code
  x86/apic: Avoid useless scanning thru a cpumask in assign_irq_vector()
  x86/apic: Try to spread IRQ vectors to different priority levels
  x86/apic: Factor out default vector_allocation_domain() operation
  ...
---

bd3e57f9132ac55e2848aa10cf50341de2508e1d
diff --cc arch/x86/kernel/apic/summit_32.c
index e97d542,b6e6185..77c95c0
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
@@@ -277,8 -276,8 +278,8 @@@ summit_cpu_mask_to_apicid(const struct 
  		int new_apicid = early_per_cpu(x86_cpu_to_logical_apicid, cpu);
  
  		if (round && APIC_CLUSTER(apicid) != APIC_CLUSTER(new_apicid)) {
 -			printk("%s: Not a valid mask!\n", __func__);
 +			pr_err("Not a valid mask!\n");
- 			return BAD_APICID;
+ 			return -EINVAL;
  		}
  		apicid |= new_apicid;
  		round++;