Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some underscores in curcpu() to avoid a -Wshadow.

This commit is contained in:
fvdl 2003-03-18 22:29:58 +00:00
parent 47bc3eb448
commit 93d2b9ee12
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/i386/include/cpu.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.h,v 1.98 2003/03/01 16:37:54 fvdl Exp $ */
/* $NetBSD: cpu.h,v 1.99 2003/03/18 22:29:58 fvdl Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -204,9 +204,9 @@ extern struct cpu_info *cpu_info_list;
#define CPU_STOP(_ci) ((_ci)->ci_func->stop(_ci))
#define CPU_START_CLEANUP(_ci) ((_ci)->ci_func->cleanup(_ci))
#define curcpu() ({struct cpu_info *ci; \
asm volatile("movl %%fs:4,%0" : "=r" (ci)); \
ci;})
#define curcpu() ({struct cpu_info *__ci; \
asm volatile("movl %%fs:4,%0":"=r" (__ci)); \
__ci;})
#define cpu_number() (curcpu()->ci_cpuid)
#define CPU_IS_PRIMARY(ci) ((ci)->ci_flags & CPUF_PRIMARY)

8
sys/arch/x86_64/include/cpu.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.h,v 1.7 2003/03/05 23:56:01 fvdl Exp $ */
/* $NetBSD: cpu.h,v 1.8 2003/03/18 22:31:00 fvdl Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -147,9 +147,9 @@ extern struct cpu_info *cpu_info_list;
#define CPU_STOP(_ci) ((_ci)->ci_func->stop(_ci))
#define CPU_START_CLEANUP(_ci) ((_ci)->ci_func->cleanup(_ci))
#define curcpu() ({struct cpu_info *ci; \
asm volatile("movq %%gs:8,%0" : "=r" (ci)); \
ci;})
#define curcpu() ({struct cpu_info *__ci; \
asm volatile("movq %%gs:8,%0" : "=r" (__ci)); \
__ci;})
#define cpu_number() (curcpu()->ci_cpuid)
#define CPU_IS_PRIMARY(ci) ((ci)->ci_flags & CPUF_PRIMARY)