From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 14 Nov 2013 02:29:41 +0000 (+1030)
Subject: Merge branch 'master' of ozlabs.org:ccan
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=02ae136a997a5e7cc3bb9210167a066b9f169a7b;hp=1273379185b86aefe5d426d3208289b70044acac

Merge branch 'master' of ozlabs.org:ccan
---

diff --git a/ccan/cpuid/cpuid.c b/ccan/cpuid/cpuid.c
index a64b1575..ad134b56 100644
--- a/ccan/cpuid/cpuid.c
+++ b/ccan/cpuid/cpuid.c
@@ -314,7 +314,7 @@ void cpuid(cpuid_t info, uint32_t *buf)
 			buf[5] = ebx & 0xFF;
 			buf[6] = (ebx >> 8) & 0xFF;
 			buf[7] = (ebx >> 16) & 0xFF;
-			buf[8] = (ebx >> 24) & 0xFF;
+			buf[8] = ebx >> 24;
 			break;
 		case CPUID_CACHE_AND_TLBD_INFO:
 			buf[0] = eax;
@@ -330,22 +330,22 @@ void cpuid(cpuid_t info, uint32_t *buf)
 			buf[0] = eax & 0xFF;
 			buf[1] = (eax >> 8) & 0xFF;
 			buf[2] = (eax >> 16) & 0xFF;
-			buf[3] = (eax >> 24) & 0xFF;
+			buf[3] = eax >> 24;
 
 			buf[4] = ebx & 0xFF;
 			buf[5] = (ebx >> 8) & 0xFF;
 			buf[6] = (ebx >> 16) & 0xFF;
-			buf[7] = (ebx >> 24) & 0xFF;
+			buf[7] = ebx >> 24;
 
 			buf[8] = ecx & 0xFF;
 			buf[9] = (ecx >> 8) & 0xFF;
 			buf[10] = (ecx >> 16) & 0xFF;
-			buf[11] = (ecx >> 24) & 0xFF;
+			buf[11] = ecx >> 24;
 
 			buf[12] = edx & 0xFF;
 			buf[13] = (edx >> 8) & 0xFF;
 			buf[14] = (edx >> 16) & 0xFF;
-			buf[15] = (edx >> 24) & 0xFF;
+			buf[15] = edx >> 24;
 			break;
 		case CPUID_EXTENDED_L2_CACHE_FEATURES:
 			buf[0] = ecx & 0xFF; 		/* Line size.  */