Commit ff6f87e1 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Ingo Molnar
Browse files

x86, vmlinux.lds: move vsyscall output sections 



[ Impact: cleanup ]

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Tim Abbott <tabbott@MIT.EDU>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <1240991249-27117-8-git-send-email-sam@ravnborg.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1f6397ba

arch/x86/kernel/vmlinux.lds.S

+71 −0
Original line number Diff line number Diff line
@@ -159,6 +159,77 @@ SECTIONS 
#endif

	}



#ifdef CONFIG_X86_64



#define VSYSCALL_ADDR (-10*1024*1024)

#define VSYSCALL_PHYS_ADDR ((LOADADDR(.data.read_mostly) + \

                            SIZEOF(.data.read_mostly) + 4095) & ~(4095))

#define VSYSCALL_VIRT_ADDR ((ADDR(.data.read_mostly) + \

                            SIZEOF(.data.read_mostly) + 4095) & ~(4095))



#define VLOAD_OFFSET (VSYSCALL_ADDR - VSYSCALL_PHYS_ADDR)

#define VLOAD(x) (ADDR(x) - VLOAD_OFFSET)



#define VVIRT_OFFSET (VSYSCALL_ADDR - VSYSCALL_VIRT_ADDR)

#define VVIRT(x) (ADDR(x) - VVIRT_OFFSET)



	. = VSYSCALL_ADDR;

	.vsyscall_0 : AT(VSYSCALL_PHYS_ADDR) {

		*(.vsyscall_0)

	} :user



	__vsyscall_0 = VSYSCALL_VIRT_ADDR;



	. = ALIGN(CONFIG_X86_L1_CACHE_BYTES);

	.vsyscall_fn : AT(VLOAD(.vsyscall_fn)) {

		*(.vsyscall_fn)

	}



	. = ALIGN(CONFIG_X86_L1_CACHE_BYTES);

	.vsyscall_gtod_data : AT(VLOAD(.vsyscall_gtod_data)) {

		*(.vsyscall_gtod_data)

	}



	vsyscall_gtod_data = VVIRT(.vsyscall_gtod_data);

	.vsyscall_clock : AT(VLOAD(.vsyscall_clock)) {

		*(.vsyscall_clock)

	}

	vsyscall_clock = VVIRT(.vsyscall_clock);





	.vsyscall_1 ADDR(.vsyscall_0) + 1024: AT(VLOAD(.vsyscall_1)) {

		*(.vsyscall_1)

	}

	.vsyscall_2 ADDR(.vsyscall_0) + 2048: AT(VLOAD(.vsyscall_2)) {

		*(.vsyscall_2)

	}



	.vgetcpu_mode : AT(VLOAD(.vgetcpu_mode)) {

		*(.vgetcpu_mode)

	}

	vgetcpu_mode = VVIRT(.vgetcpu_mode);



	. = ALIGN(CONFIG_X86_L1_CACHE_BYTES);

	.jiffies : AT(VLOAD(.jiffies)) {

		*(.jiffies)

	}

	jiffies = VVIRT(.jiffies);



	.vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {

		*(.vsyscall_3)

	}



	. = VSYSCALL_VIRT_ADDR + PAGE_SIZE;



#undef VSYSCALL_ADDR

#undef VSYSCALL_PHYS_ADDR

#undef VSYSCALL_VIRT_ADDR

#undef VLOAD_OFFSET

#undef VLOAD

#undef VVIRT_OFFSET

#undef VVIRT



#endif /* CONFIG_X86_64 */



#ifdef CONFIG_X86_32

# include "vmlinux_32.lds.S"

arch/x86/kernel/vmlinux_64.lds.S

+0 −68
Original line number Diff line number Diff line 
#define VSYSCALL_ADDR (-10*1024*1024)

#define VSYSCALL_PHYS_ADDR ((LOADADDR(.data.read_mostly) + \

                            SIZEOF(.data.read_mostly) + 4095) & ~(4095))

#define VSYSCALL_VIRT_ADDR ((ADDR(.data.read_mostly) + \

                            SIZEOF(.data.read_mostly) + 4095) & ~(4095))



#define VLOAD_OFFSET (VSYSCALL_ADDR - VSYSCALL_PHYS_ADDR)

#define VLOAD(x) (ADDR(x) - VLOAD_OFFSET)



#define VVIRT_OFFSET (VSYSCALL_ADDR - VSYSCALL_VIRT_ADDR)

#define VVIRT(x) (ADDR(x) - VVIRT_OFFSET)



	. = VSYSCALL_ADDR;

	.vsyscall_0 : AT(VSYSCALL_PHYS_ADDR) {

		*(.vsyscall_0)

	} :user



	__vsyscall_0 = VSYSCALL_VIRT_ADDR;



	. = ALIGN(CONFIG_X86_L1_CACHE_BYTES);

	.vsyscall_fn : AT(VLOAD(.vsyscall_fn)) {

		*(.vsyscall_fn)

	}



	. = ALIGN(CONFIG_X86_L1_CACHE_BYTES);

	.vsyscall_gtod_data : AT(VLOAD(.vsyscall_gtod_data)) {

		*(.vsyscall_gtod_data)

	}



	vsyscall_gtod_data = VVIRT(.vsyscall_gtod_data);

	.vsyscall_clock : AT(VLOAD(.vsyscall_clock)) {

		*(.vsyscall_clock)

	}

	vsyscall_clock = VVIRT(.vsyscall_clock);





	.vsyscall_1 ADDR(.vsyscall_0) + 1024: AT(VLOAD(.vsyscall_1)) {

		*(.vsyscall_1)

	}

	.vsyscall_2 ADDR(.vsyscall_0) + 2048: AT(VLOAD(.vsyscall_2)) {

		*(.vsyscall_2)

	}



	.vgetcpu_mode : AT(VLOAD(.vgetcpu_mode)) {

		*(.vgetcpu_mode)

	}

	vgetcpu_mode = VVIRT(.vgetcpu_mode);



	. = ALIGN(CONFIG_X86_L1_CACHE_BYTES);

	.jiffies : AT(VLOAD(.jiffies)) {

		*(.jiffies)

	}

	jiffies = VVIRT(.jiffies);



	.vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {

		*(.vsyscall_3)

	}



	. = VSYSCALL_VIRT_ADDR + PAGE_SIZE;



#undef VSYSCALL_ADDR

#undef VSYSCALL_PHYS_ADDR

#undef VSYSCALL_VIRT_ADDR

#undef VLOAD_OFFSET

#undef VLOAD

#undef VVIRT_OFFSET

#undef VVIRT



	/* init_task */

	.data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {

		. = ALIGN(THREAD_SIZE);

CRA Git | Maintained and supported by SUSTech CRA and CCSE