Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be9d1738 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/asm: Unify segment selector defines 



Those are identical on 32- and 64-bit, unify them. No functional
change.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/1418127959-29902-1-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5de2b61a

arch/x86/include/asm/segment.h

+9 −21
Original line number Original line Diff line number Diff line
@@ -23,6 +23,15 @@ 
#define GDT_ENTRY_BOOT_TSS	(GDT_ENTRY_BOOT_CS + 2)

#define GDT_ENTRY_BOOT_TSS	(GDT_ENTRY_BOOT_CS + 2)

#define __BOOT_TSS		(GDT_ENTRY_BOOT_TSS * 8)

#define __BOOT_TSS		(GDT_ENTRY_BOOT_TSS * 8)





#define SEGMENT_RPL_MASK	0x3 /*

				     * Bottom two bits of selector give the ring

				     * privilege level

				     */

#define SEGMENT_TI_MASK		0x4 /* Bit 2 is table indicator (LDT/GDT) */

#define USER_RPL		0x3 /* User mode is privilege level 3 */

#define SEGMENT_LDT		0x4 /* LDT segment has TI set... */

#define SEGMENT_GDT		0x0 /* ... GDT has it cleared */



#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32

/*

/*

 * The layout of the per-CPU GDT under Linux:

 * The layout of the per-CPU GDT under Linux:
@@ -125,16 +134,6 @@ 
#define PNP_TS1    (GDT_ENTRY_PNPBIOS_TS1 * 8)	/* transfer data segment */

#define PNP_TS1    (GDT_ENTRY_PNPBIOS_TS1 * 8)	/* transfer data segment */

#define PNP_TS2    (GDT_ENTRY_PNPBIOS_TS2 * 8)	/* another data segment */

#define PNP_TS2    (GDT_ENTRY_PNPBIOS_TS2 * 8)	/* another data segment */





/* Bottom two bits of selector give the ring privilege level */

#define SEGMENT_RPL_MASK	0x3

/* Bit 2 is table indicator (LDT/GDT) */

#define SEGMENT_TI_MASK		0x4



/* User mode is privilege level 3 */

#define USER_RPL		0x3

/* LDT segment has TI set, GDT has it cleared */

#define SEGMENT_LDT		0x4

#define SEGMENT_GDT		0x0





/*

/*

 * Matching rules for certain types of segments.

 * Matching rules for certain types of segments.
@@ -192,17 +191,6 @@ 
#define get_kernel_rpl()  0

#define get_kernel_rpl()  0

#endif

#endif





/* User mode is privilege level 3 */

#define USER_RPL		0x3

/* LDT segment has TI set, GDT has it cleared */

#define SEGMENT_LDT		0x4

#define SEGMENT_GDT		0x0



/* Bottom two bits of selector give the ring privilege level */

#define SEGMENT_RPL_MASK	0x3

/* Bit 2 is table indicator (LDT/GDT) */

#define SEGMENT_TI_MASK		0x4



#define IDT_ENTRIES 256

#define IDT_ENTRIES 256

#define NUM_EXCEPTION_VECTORS 32

#define NUM_EXCEPTION_VECTORS 32

/* Bitmask of exception vectors which push an error code on the stack */

/* Bitmask of exception vectors which push an error code on the stack */