Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

parisc: Print hardware IDs as 4 digit hex strings

The hardware IDs are 32-bit unsigned integers, so print them as 4-digit
hex numbers. Additionally fix some whitespace glitches.

Signed-off-by: Helge Deller <deller@gmx.de>

+13 -13
+13 -13
arch/parisc/kernel/processor.c
··· 3 3 * Initial setup-routines for HP 9000 based hardware. 4 4 * 5 5 * Copyright (C) 1991, 1992, 1995 Linus Torvalds 6 - * Modifications for PA-RISC (C) 1999-2008 Helge Deller <deller@gmx.de> 6 + * Modifications for PA-RISC (C) 1999-2026 Helge Deller <deller@gmx.de> 7 7 * Modifications copyright 1999 SuSE GmbH (Philipp Rumpf) 8 8 * Modifications copyright 2000 Martin K. Petersen <mkp@mkp.net> 9 9 * Modifications copyright 2000 Philipp Rumpf <prumpf@tux.org> ··· 41 41 DEFINE_PER_CPU(struct cpuinfo_parisc, cpu_data); 42 42 43 43 /* 44 - ** PARISC CPU driver - claim "device" and initialize CPU data structures. 44 + ** PARISC CPU driver - claim "device" and initialize CPU data structures. 45 45 ** 46 46 ** Consolidate per CPU initialization into (mostly) one module. 47 47 ** Monarch CPU will initialize boot_cpu_data which shouldn't ··· 74 74 * processor_probe - Determine if processor driver should claim this device. 75 75 * @dev: The device which has been found. 76 76 * 77 - * Determine if processor driver should claim this chip (return 0) or not 78 - * (return 1). If so, initialize the chip and tell other partners in crime 77 + * Determine if processor driver should claim this chip (return 0) or not 78 + * (return 1). If so, initialize the chip and tell other partners in crime 79 79 * they have work to do. 80 80 */ 81 81 static int __init processor_probe(struct parisc_device *dev) ··· 207 207 } 208 208 #endif 209 209 210 - /* 210 + /* 211 211 * Bring this CPU up now! (ignore bootstrap cpuid == 0) 212 212 */ 213 213 #ifdef CONFIG_SMP ··· 241 241 /* get CPU-Model Information... */ 242 242 #define p ((unsigned long *)&boot_cpu_data.pdc.model) 243 243 if (pdc_model_info(&boot_cpu_data.pdc.model) == PDC_OK) { 244 - printk(KERN_INFO 245 - "model %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", 246 - p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8], p[9]); 244 + pr_info("model 0x%04lx 0x%04lx 0x%04lx 0x%04lx 0x%04lx " 245 + "0x%04lx 0x%04lx 0x%04lx 0x%04lx 0x%04lx\n", 246 + p[0], p[1], p[2], p[3], p[4], 247 + p[5], p[6], p[7], p[8], p[9]); 247 248 248 249 add_device_randomness(&boot_cpu_data.pdc.model, 249 250 sizeof(boot_cpu_data.pdc.model)); ··· 252 251 #undef p 253 252 254 253 if (pdc_model_versions(&boot_cpu_data.pdc.versions, 0) == PDC_OK) { 255 - printk(KERN_INFO "vers %08lx\n", 256 - boot_cpu_data.pdc.versions); 254 + pr_info("vers 0x%04lx\n", boot_cpu_data.pdc.versions); 257 255 258 256 add_device_randomness(&boot_cpu_data.pdc.versions, 259 257 sizeof(boot_cpu_data.pdc.versions)); 260 258 } 261 259 262 260 if (pdc_model_cpuid(&boot_cpu_data.pdc.cpuid) == PDC_OK) { 263 - printk(KERN_INFO "CPUID vers %ld rev %ld (0x%08lx)\n", 261 + pr_info("CPUID vers %ld rev %ld (0x%04lx)\n", 264 262 (boot_cpu_data.pdc.cpuid >> 5) & 127, 265 263 boot_cpu_data.pdc.cpuid & 31, 266 264 boot_cpu_data.pdc.cpuid); ··· 437 437 boot_cpu_data.pdc.sys_model_name, 438 438 cpu_name); 439 439 440 - seq_printf(m, "hversion\t: 0x%08x\n" 441 - "sversion\t: 0x%08x\n", 440 + seq_printf(m, "hversion\t: 0x%04x\n" 441 + "sversion\t: 0x%04x\n", 442 442 boot_cpu_data.hversion, 443 443 boot_cpu_data.sversion ); 444 444