rtl88x2CE_WiFi_linux driver

hc

2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8

 kernel/arch/parisc/kernel/processor.c
..
..
@@ -163,7 +163,6 @@
163
163
 	if (cpuid)
164
164
 		memset(p, 0, sizeof(struct cpuinfo_parisc));
165
165
 
166
-	p->loops_per_jiffy = loops_per_jiffy;
167
166
 	p->dev = dev;		/* Save IODC data in case we need it */
168
167
 	p->hpa = dev->hpa.start;	/* save CPU hpa */
169
168
 	p->cpuid = cpuid;	/* save CPU id */
..
..
@@ -373,10 +372,18 @@
373
372
 show_cpuinfo (struct seq_file *m, void *v)
374
373
 {
375
374
 	unsigned long cpu;
375
+	char cpu_name[60], *p;
376
+
377
+	/* strip PA path from CPU name to not confuse lscpu */
378
+	strlcpy(cpu_name, per_cpu(cpu_data, 0).dev->name, sizeof(cpu_name));
379
+	p = strrchr(cpu_name, '[');
380
+	if (p)
381
+		*(--p) = 0;
376
382
 
377
383
 	for_each_online_cpu(cpu) {
378
-		const struct cpuinfo_parisc *cpuinfo = &per_cpu(cpu_data, cpu);
379
384
 #ifdef CONFIG_SMP
385
+		const struct cpuinfo_parisc *cpuinfo = &per_cpu(cpu_data, cpu);
386
+
380
387
 		if (0 == cpuinfo->hpa)
381
388
 			continue;
382
389
 #endif
..
..
@@ -421,8 +428,7 @@
421
428
 
422
429
 		seq_printf(m, "model\t\t: %s - %s\n",
423
430
 				 boot_cpu_data.pdc.sys_model_name,
424
-				 cpuinfo->dev ?
425
-				 cpuinfo->dev->name : "Unknown");
431
+				 cpu_name);
426
432
 
427
433
 		seq_printf(m, "hversion\t: 0x%08x\n"
428
434
 			        "sversion\t: 0x%08x\n",
..
..
@@ -433,8 +439,8 @@
433
439
 		show_cache_info(m);
434
440
 
435
441
 		seq_printf(m, "bogomips\t: %lu.%02lu\n",
436
-			     cpuinfo->loops_per_jiffy / (500000 / HZ),
437
-			     (cpuinfo->loops_per_jiffy / (5000 / HZ)) % 100);
442
+			     loops_per_jiffy / (500000 / HZ),
443
+			     loops_per_jiffy / (5000 / HZ) % 100);
438
444
 
439
445
 		seq_printf(m, "software id\t: %ld\n\n",
440
446
 				boot_cpu_data.pdc.model.sw_id);