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

Commit cdc4b9c0 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Remove unused segments 



They used to be used by the reboot code, but not anymore.

Noticed by Jan Beulich

Cc: JBeulich@novell.com

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent af5b9804

arch/x86_64/kernel/head.S

+2 −3
Original line number Original line Diff line number Diff line
@@ -386,7 +386,7 @@ gdt: 
	

	

ENTRY(cpu_gdt_table)

ENTRY(cpu_gdt_table)

	.quad	0x0000000000000000	/* NULL descriptor */

	.quad	0x0000000000000000	/* NULL descriptor */

	.quad	0x008f9a000000ffff	/* __KERNEL_COMPAT32_CS */	

	.quad	0x0			/* unused */

	.quad	0x00af9a000000ffff	/* __KERNEL_CS */

	.quad	0x00af9a000000ffff	/* __KERNEL_CS */

	.quad	0x00cf92000000ffff	/* __KERNEL_DS */

	.quad	0x00cf92000000ffff	/* __KERNEL_DS */

	.quad	0x00cffa000000ffff	/* __USER32_CS */

	.quad	0x00cffa000000ffff	/* __USER32_CS */
@@ -396,8 +396,7 @@ ENTRY(cpu_gdt_table) 
	.quad	0,0			/* TSS */

	.quad	0,0			/* TSS */

	.quad	0,0			/* LDT */

	.quad	0,0			/* LDT */

	.quad   0,0,0			/* three TLS descriptors */ 

	.quad   0,0,0			/* three TLS descriptors */ 

	.quad	0x00009a000000ffff	/* __KERNEL16_CS - 16bit PM for S3 wakeup. */

	.quad	0			/* unused */

					/* base must be patched for real base address. */

gdt_end:	

gdt_end:	

	/* asm/segment.h:GDT_ENTRIES must match this */	

	/* asm/segment.h:GDT_ENTRIES must match this */	

	/* This should be a multiple of the cache line size */

	/* This should be a multiple of the cache line size */

include/asm-x86_64/segment.h

+1 −3
Original line number Original line Diff line number Diff line
@@ -19,15 +19,13 @@ 
#define __USER_DS     0x2b   /* 5*8+3 */ 

#define __USER_DS     0x2b   /* 5*8+3 */ 

#define __USER_CS     0x33   /* 6*8+3 */ 

#define __USER_CS     0x33   /* 6*8+3 */ 

#define __USER32_DS	__USER_DS 

#define __USER32_DS	__USER_DS 

#define __KERNEL16_CS	(GDT_ENTRY_KERNELCS16 * 8)

#define __KERNEL_COMPAT32_CS   0x8





#define GDT_ENTRY_TLS 1

#define GDT_ENTRY_TLS 1

#define GDT_ENTRY_TSS 8	/* needs two entries */

#define GDT_ENTRY_TSS 8	/* needs two entries */

#define GDT_ENTRY_LDT 10 /* needs two entries */

#define GDT_ENTRY_LDT 10 /* needs two entries */

#define GDT_ENTRY_TLS_MIN 12

#define GDT_ENTRY_TLS_MIN 12

#define GDT_ENTRY_TLS_MAX 14

#define GDT_ENTRY_TLS_MAX 14

#define GDT_ENTRY_KERNELCS16 15

/* 15 free */





#define GDT_ENTRY_TLS_ENTRIES 3

#define GDT_ENTRY_TLS_ENTRIES 3