| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 18 Aug 2008 23:12:33 +0400
From: Cyrill Gorcunov <gorcunov@...il.com>
To: "H. Peter Anvin" <hpa@...or.com>
Cc: mingo@...e.hu, macro@...ux-mips.org, tglx@...utronix.de,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH 0/15] apic: unification series 5
[H. Peter Anvin - Mon, Aug 18, 2008 at 10:22:12AM -0700]
> Cyrill Gorcunov wrote:
>>
>> With this series 32bit code compilation warns:
>>
>> arch/x86/kernel/apic_32.c: In function ‘end_local_APIC_setup’:
>> arch/x86/kernel/apic_32.c:1165: warning: ISO C90 forbids mixed declarations and code
>> arch/x86/kernel/apic_32.c: In function ‘disconnect_bsp_APIC’:
>> arch/x86/kernel/apic_32.c:1446: warning: ISO C90 forbids mixed declarations and code
>> cyrill@...ovo linux-2.6.git $
>>
>> So parenthesis will be needed to eliminate them... but
>> I think it could be too ugly... need some time to think.
>> So patches 8/15 and 10/15 sould be not applied for now - just review them.
>> Thanks for patience!
>>
>
> Typically, just move the declaration to the top of the function
> (followed by a blank line.)
>
> -hpa
>
Here is compilation warnings fix
- Cyrill -
---
x86: apic - compilation wrnings fix
Signed-off-by: Cyrill Gorcunov <gorcunov@...il.com>
---
Please check if it's not worse code form now :)
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index e975562..b8d80c2 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -1162,11 +1162,13 @@ void __cpuinit end_local_APIC_setup(void)
lapic_setup_esr();
#ifdef CONFIG_X86_32
- unsigned int value;
- /* Disable the local apic timer */
- value = apic_read(APIC_LVTT);
- value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
- apic_write(APIC_LVTT, value);
+ {
+ unsigned int value;
+ /* Disable the local apic timer */
+ value = apic_read(APIC_LVTT);
+ value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
+ apic_write(APIC_LVTT, value);
+ }
#endif
setup_apic_nmi_watchdog(NULL);
@@ -1426,6 +1428,8 @@ void __init connect_bsp_APIC(void)
*/
void disconnect_bsp_APIC(int virt_wire_setup)
{
+ unsigned int value;
+
#ifdef CONFIG_X86_32
if (pic_mode) {
/*
@@ -1443,7 +1447,6 @@ void disconnect_bsp_APIC(int virt_wire_setup)
#endif
/* Go back to Virtual Wire compatibility mode */
- unsigned int value;
/* For the spurious interrupt use vector F, and enable it */
value = apic_read(APIC_SPIV);
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 7a31718..37e0376 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -1020,11 +1020,13 @@ void __cpuinit end_local_APIC_setup(void)
lapic_setup_esr();
#ifdef CONFIG_X86_32
- unsigned int value;
- /* Disable the local apic timer */
- value = apic_read(APIC_LVTT);
- value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
- apic_write(APIC_LVTT, value);
+ {
+ unsigned int value;
+ /* Disable the local apic timer */
+ value = apic_read(APIC_LVTT);
+ value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
+ apic_write(APIC_LVTT, value);
+ }
#endif
setup_apic_nmi_watchdog(NULL);
@@ -1363,6 +1365,8 @@ void __init connect_bsp_APIC(void)
*/
void disconnect_bsp_APIC(int virt_wire_setup)
{
+ unsigned int value;
+
#ifdef CONFIG_X86_32
if (pic_mode) {
/*
@@ -1380,7 +1384,6 @@ void disconnect_bsp_APIC(int virt_wire_setup)
#endif
/* Go back to Virtual Wire compatibility mode */
- unsigned int value;
/* For the spurious interrupt use vector F, and enable it */
value = apic_read(APIC_SPIV);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists