[PATCH] x86: Removed superfluous parentheses in macro defs

[PATCH] x86: Removed superfluous parentheses in macro defs

[Alex Ben]

1) make it consistent with other constant macro deinitions, which
don't have parentheses, as they are really superfluous.

2) the extra parentheses on the 5th line of #define GDT_ENTRY is
superfluous, as there is no bit shifting on that line.
---
 arch/x86/include/asm/segment.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
index 5e64171..92621c1 100644
--- a/arch/x86/include/asm/segment.h
+++ b/arch/x86/include/asm/segment.h
@@ -10,7 +10,7 @@
	 (((flags) & _AC(0x0000f0ff,ULL)) << 40) |	\
	 (((limit) & _AC(0x000f0000,ULL)) << (48-16)) |	\
	 (((base)  & _AC(0x00ffffff,ULL)) << 16) |	\
-	 (((limit) & _AC(0x0000ffff,ULL))))
+	 ((limit)  & _AC(0x0000ffff,ULL)))

 /* Simple and small GDT entries for booting only */

@@ -75,7 +75,7 @@

 #define GDT_ENTRY_DEFAULT_USER_DS	15

-#define GDT_ENTRY_KERNEL_BASE		(12)
+#define GDT_ENTRY_KERNEL_BASE		12

 #define GDT_ENTRY_KERNEL_CS		(GDT_ENTRY_KERNEL_BASE+0)

--
1.7.4.1

Re: [PATCH] x86: Removed superfluous parentheses in macro defs

[Borislav Petkov]

On Fri, Oct 07, 2011 at 09:22:04AM +1100, Alex Ben wrote:
> 1) make it consistent with other constant macro deinitions, which
> don't have parentheses, as they are really superfluous.
> 
> 2) the extra parentheses on the 5th line of #define GDT_ENTRY is
> superfluous, as there is no bit shifting on that line.
> ---
>  arch/x86/include/asm/segment.h |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
> index 5e64171..92621c1 100644
> --- a/arch/x86/include/asm/segment.h
> +++ b/arch/x86/include/asm/segment.h
> @@ -10,7 +10,7 @@
> 	 (((flags) & _AC(0x0000f0ff,ULL)) << 40) |	\
> 	 (((limit) & _AC(0x000f0000,ULL)) << (48-16)) |	\
> 	 (((base)  & _AC(0x00ffffff,ULL)) << 16) |	\
> -	 (((limit) & _AC(0x0000ffff,ULL))))
> +	 ((limit)  & _AC(0x0000ffff,ULL)))
> 
>  /* Simple and small GDT entries for booting only */
> 
> @@ -75,7 +75,7 @@
> 
>  #define GDT_ENTRY_DEFAULT_USER_DS	15
> 
> -#define GDT_ENTRY_KERNEL_BASE		(12)
> +#define GDT_ENTRY_KERNEL_BASE		12

Please do a git annotate on the file you're patching and look at the
commit id which is listed for the GDT_ENTRY_KERNEL_BASE line to find out
why is the 12 parenthesized. Hint: 3234282f33b29

:-)

-- 
Regards/Gruss,
    Boris.

Re: [PATCH] x86: Removed superfluous parentheses in macro defs

[H. Peter Anvin]

On 10/06/2011 03:22 PM, Alex Ben wrote:
> 1) make it consistent with other constant macro deinitions, which
> don't have parentheses, as they are really superfluous.

Superfluous, yes, but it makes the expression read more regular.

> diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
> index 5e64171..92621c1 100644
> --- a/arch/x86/include/asm/segment.h
> +++ b/arch/x86/include/asm/segment.h
> @@ -10,7 +10,7 @@
> 	 (((flags) & _AC(0x0000f0ff,ULL)) << 40) |	\
> 	 (((limit) & _AC(0x000f0000,ULL)) << (48-16)) |	\
> 	 (((base)  & _AC(0x00ffffff,ULL)) << 16) |	\
> -	 (((limit) & _AC(0x0000ffff,ULL))))
> +	 ((limit)  & _AC(0x0000ffff,ULL)))
> 

So NAK.

	-hpa


-- 
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.