Move linux_id into top-level processor structure

35 files changed, 55 insertions, 55 deletions

diff --git a/test/blu-r1-hd.cc b/test/blu-r1-hd.cc
index 14d0014..d5896f9 100644
--- a/test/blu-r1-hd.cc
+++ b/test/blu-r1-hd.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/galaxy-c9-pro.cc b/test/galaxy-c9-pro.cc
index 21b195a..adb477c 100644
--- a/test/galaxy-c9-pro.cc
+++ b/test/galaxy-c9-pro.cc
@@ -44,13 +44,13 @@ TEST(PROCESSORS, linux_id) {
 			case 1:
 			case 2:
 			case 3:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 4:
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(i - 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 4, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/galaxy-grand-prime-value-edition.cc b/test/galaxy-grand-prime-value-edition.cc
index 481280f..bcd92cf 100644
--- a/test/galaxy-grand-prime-value-edition.cc
+++ b/test/galaxy-grand-prime-value-edition.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/galaxy-j7-tmobile.cc b/test/galaxy-j7-tmobile.cc
index b279a76..80bed3e 100644
--- a/test/galaxy-j7-tmobile.cc
+++ b/test/galaxy-j7-tmobile.cc
@@ -31,13 +31,13 @@ TEST(PROCESSORS, linux_id) {
 			case 1:
 			case 2:
 			case 3:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 4:
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(i - 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 4, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/galaxy-j7-uae.cc b/test/galaxy-j7-uae.cc
index 71ce0ad..5276776 100644
--- a/test/galaxy-j7-uae.cc
+++ b/test/galaxy-j7-uae.cc
@@ -31,13 +31,13 @@ TEST(PROCESSORS, linux_id) {
 			case 1:
 			case 2:
 			case 3:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 4:
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(i - 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 4, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/galaxy-s3-us.cc b/test/galaxy-s3-us.cc
index aa29816..7a403fd 100644
--- a/test/galaxy-s3-us.cc
+++ b/test/galaxy-s3-us.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/galaxy-s4-us.cc b/test/galaxy-s4-us.cc
index 88bf14c..dd7c6ed 100644
--- a/test/galaxy-s4-us.cc
+++ b/test/galaxy-s4-us.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/galaxy-s5-global.cc b/test/galaxy-s5-global.cc
index d9a3302..ad32ef7 100644
--- a/test/galaxy-s5-global.cc
+++ b/test/galaxy-s5-global.cc
@@ -44,13 +44,13 @@ TEST(PROCESSORS, linux_id) {
 			case 1:
 			case 2:
 			case 3:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 4:
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(i - 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 4, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/galaxy-s5-us.cc b/test/galaxy-s5-us.cc
index f9db4e3..b9cddf2 100644
--- a/test/galaxy-s5-us.cc
+++ b/test/galaxy-s5-us.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/galaxy-s6.cc b/test/galaxy-s6.cc
index a977b39..06ccf1a 100644
--- a/test/galaxy-s6.cc
+++ b/test/galaxy-s6.cc
@@ -44,13 +44,13 @@ TEST(PROCESSORS, linux_id) {
 			case 1:
 			case 2:
 			case 3:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 4:
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(i - 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 4, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/galaxy-s7-global.cc b/test/galaxy-s7-global.cc
index 7a8e7b4..78ed7e4 100644
--- a/test/galaxy-s7-global.cc
+++ b/test/galaxy-s7-global.cc
@@ -57,13 +57,13 @@ TEST(PROCESSORS, linux_id) {
 			case 1:
 			case 2:
 			case 3:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 4:
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(i - 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 4, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/galaxy-s7-us.cc b/test/galaxy-s7-us.cc
index 9eccdb8..9867459 100644
--- a/test/galaxy-s7-us.cc
+++ b/test/galaxy-s7-us.cc
@@ -29,11 +29,11 @@ TEST(PROCESSORS, linux_id) {
 		switch (i) {
 			case 0:
 			case 1:
-				ASSERT_EQ(i + 2, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 2, cpuinfo_processors[i].linux_id);
 				break;
 			case 2:
 			case 3:
-				ASSERT_EQ(i - 2, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 2, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/galaxy-s8-global.cc b/test/galaxy-s8-global.cc
index 9446053..8f8eb25 100644
--- a/test/galaxy-s8-global.cc
+++ b/test/galaxy-s8-global.cc
@@ -57,13 +57,13 @@ TEST(PROCESSORS, linux_id) {
 			case 1:
 			case 2:
 			case 3:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 4:
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(i - 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 4, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/galaxy-s8-us.cc b/test/galaxy-s8-us.cc
index 5f17e95..e2d722d 100644
--- a/test/galaxy-s8-us.cc
+++ b/test/galaxy-s8-us.cc
@@ -44,13 +44,13 @@ TEST(PROCESSORS, linux_id) {
 			case 1:
 			case 2:
 			case 3:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 4:
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(i - 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 4, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/huawei-mate-8.cc b/test/huawei-mate-8.cc
index a2cd96e..255b0b5 100644
--- a/test/huawei-mate-8.cc
+++ b/test/huawei-mate-8.cc
@@ -44,13 +44,13 @@ TEST(PROCESSORS, linux_id) {
 			case 1:
 			case 2:
 			case 3:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 4:
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(i - 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 4, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/huawei-p9-lite.cc b/test/huawei-p9-lite.cc
index 8597133..b34883f 100644
--- a/test/huawei-p9-lite.cc
+++ b/test/huawei-p9-lite.cc
@@ -31,13 +31,13 @@ TEST(PROCESSORS, linux_id) {
 			case 1:
 			case 2:
 			case 3:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 4:
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(i - 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 4, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/lenovo-a6600-plus.cc b/test/lenovo-a6600-plus.cc
index c08cec1..13e50b0 100644
--- a/test/lenovo-a6600-plus.cc
+++ b/test/lenovo-a6600-plus.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/lenovo-vibe-x2.cc b/test/lenovo-vibe-x2.cc
index cdd32c7..440c737 100644
--- a/test/lenovo-vibe-x2.cc
+++ b/test/lenovo-vibe-x2.cc
@@ -44,13 +44,13 @@ TEST(PROCESSORS, linux_id) {
 			case 1:
 			case 2:
 			case 3:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 4:
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(i - 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 4, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/lg-k10-eu.cc b/test/lg-k10-eu.cc
index b5fc98a..ea1436c 100644
--- a/test/lg-k10-eu.cc
+++ b/test/lg-k10-eu.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/meizu-pro-6s.cc b/test/meizu-pro-6s.cc
index 6636c9c..e1f905b 100644
--- a/test/meizu-pro-6s.cc
+++ b/test/meizu-pro-6s.cc
@@ -44,19 +44,19 @@ TEST(PROCESSORS, linux_id) {
 		switch (i) {
 			case 0:
 			case 1:
-				ASSERT_EQ(i + 8, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 8, cpuinfo_processors[i].linux_id);
 				break;
 			case 2:
 			case 3:
 			case 4:
 			case 5:
-				ASSERT_EQ(i + 2, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 2, cpuinfo_processors[i].linux_id);
 				break;
 			case 6:
 			case 7:
 			case 8:
 			case 9:
-				ASSERT_EQ(i - 6, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 6, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/moto-e-gen1.cc b/test/moto-e-gen1.cc
index dc28e77..7f745a4 100644
--- a/test/moto-e-gen1.cc
+++ b/test/moto-e-gen1.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/moto-g-gen2.cc b/test/moto-g-gen2.cc
index 279cfc1..bdb9904 100644
--- a/test/moto-g-gen2.cc
+++ b/test/moto-g-gen2.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/moto-g-gen3.cc b/test/moto-g-gen3.cc
index 89f2fe1..e453cdc 100644
--- a/test/moto-g-gen3.cc
+++ b/test/moto-g-gen3.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/nexus-s.cc b/test/nexus-s.cc
index d639dde..fe97c26 100644
--- a/test/nexus-s.cc
+++ b/test/nexus-s.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/nexus4.cc b/test/nexus4.cc
index 6ba66c7..e137367 100644
--- a/test/nexus4.cc
+++ b/test/nexus4.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/nexus5x.cc b/test/nexus5x.cc
index 310ab92..1093e10 100644
--- a/test/nexus5x.cc
+++ b/test/nexus5x.cc
@@ -40,13 +40,13 @@ TEST(PROCESSORS, linux_id) {
 		switch (i) {
 			case 0:
 			case 1:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 2:
 			case 3:
 			case 4:
 			case 5:
-				ASSERT_EQ(i - 2, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 2, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/nexus6.cc b/test/nexus6.cc
index f9180c7..5e37d88 100644
--- a/test/nexus6.cc
+++ b/test/nexus6.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/nexus6p.cc b/test/nexus6p.cc
index df2a5d9..88215b8 100644
--- a/test/nexus6p.cc
+++ b/test/nexus6p.cc
@@ -44,13 +44,13 @@ TEST(PROCESSORS, linux_id) {
 			case 1:
 			case 2:
 			case 3:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 4:
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(i - 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 4, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/nexus9.cc b/test/nexus9.cc
index 4948e49..3e2004e 100644
--- a/test/nexus9.cc
+++ b/test/nexus9.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/oppo-r9.cc b/test/oppo-r9.cc
index 53c2a58..2a27d1a 100644
--- a/test/oppo-r9.cc
+++ b/test/oppo-r9.cc
@@ -31,13 +31,13 @@ TEST(PROCESSORS, DISABLED_linux_id) {
 			case 1:
 			case 2:
 			case 3:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 4:
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(i - 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 4, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/pixel-c.cc b/test/pixel-c.cc
index bf7c395..2a40a62 100644
--- a/test/pixel-c.cc
+++ b/test/pixel-c.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/pixel-xl.cc b/test/pixel-xl.cc
index 5003d27..6644134 100644
--- a/test/pixel-xl.cc
+++ b/test/pixel-xl.cc
@@ -29,11 +29,11 @@ TEST(PROCESSORS, linux_id) {
 		switch (i) {
 			case 0:
 			case 1:
-				ASSERT_EQ(i + 2, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 2, cpuinfo_processors[i].linux_id);
 				break;
 			case 2:
 			case 3:
-				ASSERT_EQ(i - 2, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 2, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/pixel.cc b/test/pixel.cc
index 8091be4..32bc855 100644
--- a/test/pixel.cc
+++ b/test/pixel.cc
@@ -29,11 +29,11 @@ TEST(PROCESSORS, linux_id) {
 		switch (i) {
 			case 0:
 			case 1:
-				ASSERT_EQ(i + 2, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 2, cpuinfo_processors[i].linux_id);
 				break;
 			case 2:
 			case 3:
-				ASSERT_EQ(i - 2, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 2, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}
diff --git a/test/xiaomi-redmi-2a.cc b/test/xiaomi-redmi-2a.cc
index 118d534..4d6a960 100644
--- a/test/xiaomi-redmi-2a.cc
+++ b/test/xiaomi-redmi-2a.cc
@@ -26,7 +26,7 @@ TEST(PROCESSORS, uarch) {
 
 TEST(PROCESSORS, linux_id) {
 	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(i, cpuinfo_processors[i].topology.linux_id);
+		ASSERT_EQ(i, cpuinfo_processors[i].linux_id);
 	}
 }
 
diff --git a/test/xperia-c4-dual.cc b/test/xperia-c4-dual.cc
index 7f0fc37..bd4e77d 100644
--- a/test/xperia-c4-dual.cc
+++ b/test/xperia-c4-dual.cc
@@ -31,13 +31,13 @@ TEST(PROCESSORS, DISABLED_linux_id) {
 			case 1:
 			case 2:
 			case 3:
-				ASSERT_EQ(i + 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i + 4, cpuinfo_processors[i].linux_id);
 				break;
 			case 4:
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(i - 4, cpuinfo_processors[i].topology.linux_id);
+				ASSERT_EQ(i - 4, cpuinfo_processors[i].linux_id);
 				break;
 		}
 	}