lkml.org 
[lkml]   [2003]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
SubjectRe: two x86_64 fixes for 2.4.21-pre3
Ton Hospel writes:
> In article <15921.37163.139583.74988@harpo.it.uu.se>,
> Mikael Pettersson <mikpe@csd.uu.se> writes:
> > #define safe_halt() __asm__ __volatile__("sti; hlt": : :"memory")
> >
> > +#define __save_and_cli(x) do { __save_flags(x); __cli(); } while(0);
> > +#define __save_and_sti(x) do { __save_flags(x); __sti(); } while(0);
> > +
>
> The extra ; after the while(0) look wrong.
>
> > #define restore_flags(x) __global_restore_flags(x)
> > +#define save_and_cli(x) do { save_flags(x); cli(); } while(0);
> > +#define save_and_sti(x) do { save_flags(x); sti(); } while(0);
>
> Same here

Good catch. Those #defines were copied from include/asm-i386/system.h which
contains the same extraneous semicolons. The patch below cleans this up.

/Mikael

--- linux-2.4.21-pre4/include/asm-i386/system.h.~1~ 2003-01-31 15:20:56.000000000 +0100
+++ linux-2.4.21-pre4/include/asm-i386/system.h 2003-02-04 14:04:48.000000000 +0100
@@ -322,8 +322,8 @@
/* used in the idle loop; sti takes one instruction cycle to complete */
#define safe_halt() __asm__ __volatile__("sti; hlt": : :"memory")

-#define __save_and_cli(x) do { __save_flags(x); __cli(); } while(0);
-#define __save_and_sti(x) do { __save_flags(x); __sti(); } while(0);
+#define __save_and_cli(x) do { __save_flags(x); __cli(); } while(0)
+#define __save_and_sti(x) do { __save_flags(x); __sti(); } while(0)

/* For spinlocks etc */
#if 0
@@ -348,8 +348,8 @@
#define sti() __global_sti()
#define save_flags(x) ((x)=__global_save_flags())
#define restore_flags(x) __global_restore_flags(x)
-#define save_and_cli(x) do { save_flags(x); cli(); } while(0);
-#define save_and_sti(x) do { save_flags(x); sti(); } while(0);
+#define save_and_cli(x) do { save_flags(x); cli(); } while(0)
+#define save_and_sti(x) do { save_flags(x); sti(); } while(0)

#else

--- linux-2.4.21-pre4/include/asm-x86_64/system.h.~1~ 2003-01-31 15:22:57.000000000 +0100
+++ linux-2.4.21-pre4/include/asm-x86_64/system.h 2003-02-04 14:05:07.000000000 +0100
@@ -246,8 +246,8 @@
/* used in the idle loop; sti takes one instruction cycle to complete */
#define safe_halt() __asm__ __volatile__("sti; hlt": : :"memory")

-#define __save_and_cli(x) do { __save_flags(x); __cli(); } while(0);
-#define __save_and_sti(x) do { __save_flags(x); __sti(); } while(0);
+#define __save_and_cli(x) do { __save_flags(x); __cli(); } while(0)
+#define __save_and_sti(x) do { __save_flags(x); __sti(); } while(0)

/* For spinlocks etc */
#define local_irq_save(x) do { warn_if_not_ulong(x); __asm__ __volatile__("# local_irq_save \n\t pushfq ; popq %0 ; cli":"=g" (x): /* no input */ :"memory"); } while (0)
@@ -266,8 +266,8 @@
#define sti() __global_sti()
#define save_flags(x) ((x)=__global_save_flags())
#define restore_flags(x) __global_restore_flags(x)
-#define save_and_cli(x) do { save_flags(x); cli(); } while(0);
-#define save_and_sti(x) do { save_flags(x); sti(); } while(0);
+#define save_and_cli(x) do { save_flags(x); cli(); } while(0)
+#define save_and_sti(x) do { save_flags(x); sti(); } while(0)

#else

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:32    [W:0.113 / U:0.388 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site