CVS commit: src/sys/arch/arm

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Sat Oct  6 16:04:21 UTC 2018

Modified Files:
        src/sys/arch/arm/arm32: cpu.c
        src/sys/arch/arm/broadcom: bcm283x_platform.c

Log Message:
Use __BIT.  NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/arm/arm32/cpu.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/broadcom/bcm283x_platform.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/arm/arm32/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.120 src/sys/arch/arm/arm32/cpu.c:1.121
--- src/sys/arch/arm/arm32/cpu.c:1.120	Wed Aug 15 06:06:05 2018
+++ src/sys/arch/arm/arm32/cpu.c	Sat Oct  6 16:04:21 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.120 2018/08/15 06:06:05 skrll Exp $	*/
+/*	$NetBSD: cpu.c,v 1.121 2018/10/06 16:04:21 skrll Exp $	*/
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
 #include "opt_multiprocessor.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.120 2018/08/15 06:06:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.121 2018/10/06 16:04:21 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -116,7 +116,7 @@ cpu_attach(device_t dv, cpuid_t id)
 		ci->ci_ctrl = cpu_info_store.ci_ctrl;
 		ci->ci_undefsave[2] = cpu_info_store.ci_undefsave[2];
 		cpu_info[ci->ci_cpuid] = ci;
-		if ((arm_cpu_hatched & (1 << id)) == 0) {
+		if ((arm_cpu_hatched & __BIT(id)) == 0) {
 			ci->ci_dev = dv;
 			dv->dv_private = ci;
 			aprint_naive(": disabled\n");

Index: src/sys/arch/arm/broadcom/bcm283x_platform.c
diff -u src/sys/arch/arm/broadcom/bcm283x_platform.c:1.18 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.19
--- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.18	Mon Sep 10 11:05:12 2018
+++ src/sys/arch/arm/broadcom/bcm283x_platform.c	Sat Oct  6 16:04:21 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: bcm283x_platform.c,v 1.18 2018/09/10 11:05:12 ryo Exp $	*/
+/*	$NetBSD: bcm283x_platform.c,v 1.19 2018/10/06 16:04:21 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.18 2018/09/10 11:05:12 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.19 2018/10/06 16:04:21 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_bcm283x.h"
@@ -771,7 +771,7 @@ bcm2836_bootstrap(void)
 		}
 
 		for (size_t i = 1; i < arm_cpu_max; i++) {
-			if ((arm_cpu_hatched & (1 << i)) == 0) {
+			if ((arm_cpu_hatched & __BIT(i)) == 0) {
 				printf("%s: warning: cpu%zu failed to hatch\n",
 				    __func__, i);
 			}