fixup! arch/arm64: Add Revision, Serial, Model to cpuinfo

Author: popcornmix

arch/arm64/kernel/cpuinfo.c

@@ -219,10 +219,6 @@ static int c_show(struct seq_file *m, void *v)
 	bool compat = personality(current->personality) == PER_LINUX32;
 	struct cpuinfo_arm64 *cpuinfo = v;
 	u32 midr = cpuinfo->reg_midr;
-	struct device_node *np;
-	const char *model;
-	const char *serial;
-	u32 revision;
 
 	/*
 	 * glibc reads /proc/cpuinfo to determine the number of
@@ -278,24 +274,6 @@ static int c_show(struct seq_file *m, void *v)
 	seq_printf(m, "CPU part\t: 0x%03x\n", MIDR_PARTNUM(midr));
 	seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
 
-	np = of_find_node_by_path("/system");
-	if (np) {
-		if (!of_property_read_u32(np, "linux,revision", &revision))
-			seq_printf(m, "Revision\t: %04x\n", revision);
-		of_node_put(np);
-	}
-
-	np = of_find_node_by_path("/");
-	if (np) {
-		if (!of_property_read_string(np, "serial-number",
-					     &serial))
-			seq_printf(m, "Serial\t\t: %s\n", serial);
-		if (!of_property_read_string(np, "model",
-					     &model))
-			seq_printf(m, "Model\t\t: %s\n", model);
-		of_node_put(np);
-	}
-
 	return 0;
 }
 
@@ -313,6 +291,28 @@ static void *c_next(struct seq_file *m, void *v, loff_t *pos)
 
 static void c_stop(struct seq_file *m, void *v)
 {
+	struct device_node *np;
+	const char *model;
+	const char *serial;
+	u32 revision;
+
+	np = of_find_node_by_path("/system");
+	if (np) {
+		if (!of_property_read_u32(np, "linux,revision", &revision))
+			seq_printf(m, "Revision\t: %04x\n", revision);
+		of_node_put(np);
+	}
+
+	np = of_find_node_by_path("/");
+	if (np) {
+		if (!of_property_read_string(np, "serial-number",
+					     &serial))
+			seq_printf(m, "Serial\t\t: %s\n", serial);
+		if (!of_property_read_string(np, "model",
+					     &model))
+			seq_printf(m, "Model\t\t: %s\n", model);
+		of_node_put(np);
+	}
 }
 
 const struct seq_operations cpuinfo_op = {