Fri Nov 30 08:12:27 2012 UTC ()
S/,/;/


(msaitoh)
diff -r1.88 -r1.89 src/sys/arch/arm/arm32/cpu.c
cvs diff -r1.88 -r1.89 src/sys/arch/arm/arm32/cpu.c (expand / switch to unified diff)

--- src/sys/arch/arm/arm32/cpu.c 2012/11/12 18:00:35 1.88
+++ src/sys/arch/arm/arm32/cpu.c 2012/11/30 08:12:27 1.89
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: cpu.c,v 1.88 2012/11/12 18:00:35 skrll Exp $ */ 1/* $NetBSD: cpu.c,v 1.89 2012/11/30 08:12:27 msaitoh Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1995 Mark Brinicombe. 4 * Copyright (c) 1995 Mark Brinicombe.
5 * Copyright (c) 1995 Brini. 5 * Copyright (c) 1995 Brini.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -36,27 +36,27 @@ @@ -36,27 +36,27 @@
36 * 36 *
37 * cpu.c 37 * cpu.c
38 * 38 *
39 * Probing and configuration for the master CPU 39 * Probing and configuration for the master CPU
40 * 40 *
41 * Created : 10/10/95 41 * Created : 10/10/95
42 */ 42 */
43 43
44#include "opt_armfpe.h" 44#include "opt_armfpe.h"
45#include "opt_multiprocessor.h" 45#include "opt_multiprocessor.h"
46 46
47#include <sys/param.h> 47#include <sys/param.h>
48 48
49__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.88 2012/11/12 18:00:35 skrll Exp $"); 49__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.89 2012/11/30 08:12:27 msaitoh Exp $");
50 50
51#include <sys/systm.h> 51#include <sys/systm.h>
52#include <sys/conf.h> 52#include <sys/conf.h>
53#include <sys/cpu.h> 53#include <sys/cpu.h>
54#include <sys/device.h> 54#include <sys/device.h>
55#include <sys/kmem.h> 55#include <sys/kmem.h>
56#include <sys/proc.h> 56#include <sys/proc.h>
57 57
58#include <uvm/uvm_extern.h> 58#include <uvm/uvm_extern.h>
59 59
60#include <arm/cpuconf.h> 60#include <arm/cpuconf.h>
61#include <arm/undefined.h> 61#include <arm/undefined.h>
62 62
@@ -602,27 +602,27 @@ identify_arm_cpu(device_t dv, struct cpu @@ -602,27 +602,27 @@ identify_arm_cpu(device_t dv, struct cpu
602 const char * const xname = device_xname(dv); 602 const char * const xname = device_xname(dv);
603 const char *steppingstr; 603 const char *steppingstr;
604 int i; 604 int i;
605 605
606 if (cpuid == 0) { 606 if (cpuid == 0) {
607 aprint_error("Processor failed probe - no CPU ID\n"); 607 aprint_error("Processor failed probe - no CPU ID\n");
608 return; 608 return;
609 } 609 }
610 610
611 for (i = 0; cpuids[i].cpuid != 0; i++) 611 for (i = 0; cpuids[i].cpuid != 0; i++)
612 if (cpuids[i].cpuid == (cpuid & CPU_ID_CPU_MASK)) { 612 if (cpuids[i].cpuid == (cpuid & CPU_ID_CPU_MASK)) {
613 cpu_class = cpuids[i].cpu_class; 613 cpu_class = cpuids[i].cpu_class;
614 steppingstr = cpuids[i].cpu_steppings[cpuid & 614 steppingstr = cpuids[i].cpu_steppings[cpuid &
615 CPU_ID_REVISION_MASK], 615 CPU_ID_REVISION_MASK];
616 sprintf(cpu_model, "%s%s%s (%s core)", 616 sprintf(cpu_model, "%s%s%s (%s core)",
617 cpuids[i].cpu_classname, 617 cpuids[i].cpu_classname,
618 steppingstr[0] == '*' ? "" : " ", 618 steppingstr[0] == '*' ? "" : " ",
619 &steppingstr[steppingstr[0] == '*'], 619 &steppingstr[steppingstr[0] == '*'],
620 cpu_classes[cpu_class].class_name); 620 cpu_classes[cpu_class].class_name);
621 break; 621 break;
622 } 622 }
623 623
624 if (cpuids[i].cpuid == 0) 624 if (cpuids[i].cpuid == 0)
625 sprintf(cpu_model, "unknown CPU (ID = 0x%x)", cpuid); 625 sprintf(cpu_model, "unknown CPU (ID = 0x%x)", cpuid);
626 626
627 if (ci->ci_data.cpu_cc_freq != 0) { 627 if (ci->ci_data.cpu_cc_freq != 0) {
628 char freqbuf[8]; 628 char freqbuf[8];