x86: Simplify calls to cpuid by using + for in/out constraints

Signed-off-by Josh Triplett <[email protected]>

---

Build-tested only.

 arch/x86/include/asm/processor.h |    7 +++----
 arch/x86/xen/enlighten.c         |    7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

arch/x86/include/asm/processor.h +3 -4

index c776826..dfa947e 100644
@@ -180,11 +180,10 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
 {
 	/* ecx is often an input as well as an output. */
 	asm("cpuid"
-	    : "=a" (*eax),
+	    : "+a" (*eax),
 	      "=b" (*ebx),
-	      "=c" (*ecx),
-	      "=d" (*edx)
-	    : "0" (*eax), "2" (*ecx));
+	      "+c" (*ecx),
+	      "=d" (*edx));
 }
 
 static inline void load_cr3(pgd_t *pgdir)

arch/x86/xen/enlighten.c +3 -4

index 6ee2ef8..6eab164 100644
@@ -190,11 +190,10 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
 	}
 
 	asm(XEN_EMULATE_PREFIX "cpuid"
-		: "=a" (*ax),
+		: "+a" (*ax),
 		  "=b" (*bx),
-		  "=c" (*cx),
-		  "=d" (*dx)
-		: "0" (*ax), "2" (*cx));
+		  "+c" (*cx),
+		  "=d" (*dx));
 
 	*cx &= maskecx;
 	*dx &= maskedx;

I would prefer to not apply this patch unless there is a good reason. The existing code isn't broken, and any time we change an asm() statement we risk triggering bugs in some obscure gcc version.

It isn't, of course, that the proposed change is wrong, but simply that it is an unnecessary change, and since it involves asm() statements I would like to reject it for churn reduction reasons. Especially so since it is "build-tested only".