d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Warns fixing. Protect against inappropriate linting, and mark

Browse Source 
GCC-specific assemble code as such (in #ifdefs). Fix an easy
static variable warning while I'm here.
This commit is contained in:
Mark Murray 2003-04-30 12:23:58 +00:00
parent 1d6911d10f
commit f17615daca
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=114291
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/amd64/amd64/identcpu.c
View File

@ -705,9 +705,12 @@ void
panicifcpuunsupported(void)
{
#if !defined(lint)
#if !defined(I386_CPU) && !defined(I486_CPU) && !defined(I586_CPU) && !defined(I686_CPU)
#error This kernel is not configured for one of the supported CPUs
#endif
#else /* lint */
#endif /* lint */
#if defined(I386_CPU) && (defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU))
#error I386_CPU is mutually exclusive with the other cpu types.
#endif
@ -746,6 +749,7 @@ static volatile u_int trap_by_rdmsr;
* be advanced.
*/
inthand_t bluetrap6;
#ifdef __GNUC__
__asm
(" \
.text; \
@ -757,12 +761,14 @@ __asm
addl $2, (%esp); /* rdmsr is a 2-byte instruction */ \
iret \
");
#endif
/*
* Special exception 13 handler.
* Accessing non-existent MSR generates general protection fault.
*/
inthand_t bluetrap13;
#ifdef __GNUC__
__asm
(" \
.text; \
@ -775,6 +781,7 @@ __asm
addl $2, (%esp); /* rdmsr is a 2-bytes instruction. */ \
iret; \
");
#endif
/*
* Distinguish IBM Blue Lightning CPU from Cyrix CPUs that does not
@ -1100,7 +1107,7 @@ union msrinfo {
u_int32_t regs[2];
};
u_int32_t longrun_modes[LONGRUN_MODE_MAX][3] = {
static u_int32_t longrun_modes[LONGRUN_MODE_MAX][3] = {
/* MSR low, MSR high, flags bit0 */
{ 0, 0, 0}, /* LONGRUN_MODE_MINFREQUENCY */
{ 0, 100, 0}, /* LONGRUN_MODE_ECONOMY */

9
sys/i386/i386/identcpu.c
View File

@ -705,9 +705,12 @@ void
panicifcpuunsupported(void)
{
#if !defined(lint)
#if !defined(I386_CPU) && !defined(I486_CPU) && !defined(I586_CPU) && !defined(I686_CPU)
#error This kernel is not configured for one of the supported CPUs
#endif
#else /* lint */
#endif /* lint */
#if defined(I386_CPU) && (defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU))
#error I386_CPU is mutually exclusive with the other cpu types.
#endif
@ -746,6 +749,7 @@ static volatile u_int trap_by_rdmsr;
* be advanced.
*/
inthand_t bluetrap6;
#ifdef __GNUC__
__asm
(" \
.text; \
@ -757,12 +761,14 @@ __asm
addl $2, (%esp); /* rdmsr is a 2-byte instruction */ \
iret \
");
#endif
/*
* Special exception 13 handler.
* Accessing non-existent MSR generates general protection fault.
*/
inthand_t bluetrap13;
#ifdef __GNUC__
__asm
(" \
.text; \
@ -775,6 +781,7 @@ __asm
addl $2, (%esp); /* rdmsr is a 2-bytes instruction. */ \
iret; \
");
#endif
/*
* Distinguish IBM Blue Lightning CPU from Cyrix CPUs that does not
@ -1100,7 +1107,7 @@ union msrinfo {
u_int32_t regs[2];
};
u_int32_t longrun_modes[LONGRUN_MODE_MAX][3] = {
static u_int32_t longrun_modes[LONGRUN_MODE_MAX][3] = {
/* MSR low, MSR high, flags bit0 */
{ 0, 0, 0}, /* LONGRUN_MODE_MINFREQUENCY */
{ 0, 100, 0}, /* LONGRUN_MODE_ECONOMY */