Module Name: src Committed By: rin Date: Mon Oct 11 14:33:31 UTC 2021
Modified Files: src/sys/arch/hpcarm/hpcarm: sa11x0_hpc_machdep.c Log Message: Wrap multi-line macros with ``do { } while(0)''. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.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/hpcarm/hpcarm/sa11x0_hpc_machdep.c diff -u src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.19 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.20 --- src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.19 Mon Oct 11 14:30:30 2021 +++ src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c Mon Oct 11 14:33:31 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sa11x0_hpc_machdep.c,v 1.19 2021/10/11 14:30:30 rin Exp $ */ +/* $NetBSD: sa11x0_hpc_machdep.c,v 1.20 2021/10/11 14:33:31 rin Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.19 2021/10/11 14:30:30 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.20 2021/10/11 14:33:31 rin Exp $"); #include "opt_ddb.h" #include "opt_dram_pages.h" @@ -277,12 +277,16 @@ init_sa11x0(int argc, char **argv, struc #endif /* Define a macro to simplify memory allocation */ -#define valloc_pages(var, np) \ - alloc_pages((var).pv_pa, (np)); \ - (var).pv_va = KERNEL_BASE + (var).pv_pa - physical_start; -#define alloc_pages(var, np) \ - (var) = freemempos; \ - freemempos += (np) * PAGE_SIZE; +#define valloc_pages(var, np) \ + do { \ + alloc_pages((var).pv_pa, (np)); \ + (var).pv_va = KERNEL_BASE + (var).pv_pa - physical_start; \ + } while (0) +#define alloc_pages(var, np) \ + do { \ + (var) = freemempos; \ + freemempos += (np) * PAGE_SIZE; \ + } while (0) valloc_pages(kernel_l1pt, L1_TABLE_SIZE / PAGE_SIZE); for (loop = 0; loop < NUM_KERNEL_PTS; ++loop) {