Merge branches 'x86/asm', 'x86/cleanups' and 'x86/headers' into x86/core (60916285) · Commits · e / devices / android_kernel_samsung_smdk4412

arch/x86/boot/compressed/head_32.S

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -25,14 +25,12 @@

	#include <linux/linkage.h>		#include <linux/linkage.h>
	#include <asm/segment.h>		#include <asm/segment.h>
	#include <asm/page.h>		#include <asm/page_types.h>
	#include <asm/boot.h>		#include <asm/boot.h>
	#include <asm/asm-offsets.h>		#include <asm/asm-offsets.h>

	.section ".text.head","ax",@progbits		.section ".text.head","ax",@progbits
	.globl startup_32		ENTRY(startup_32)

	startup_32:
	cld		cld
	/* test KEEP_SEGMENTS flag to see if the bootloader is asking		/* test KEEP_SEGMENTS flag to see if the bootloader is asking
	* us to not reload segments */		* us to not reload segments */
	@@ -113,6 +111,8 @@ startup_32:
	*/		*/
	leal relocated(%ebx), %eax		leal relocated(%ebx), %eax
	jmp *%eax		jmp *%eax
			ENDPROC(startup_32)

	.section ".text"		.section ".text"
	relocated:		relocated:

arch/x86/boot/compressed/head_64.S

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -26,8 +26,8 @@

	#include <linux/linkage.h>		#include <linux/linkage.h>
	#include <asm/segment.h>		#include <asm/segment.h>
	#include <asm/pgtable.h>		#include <asm/pgtable_types.h>
	#include <asm/page.h>		#include <asm/page_types.h>
	#include <asm/boot.h>		#include <asm/boot.h>
	#include <asm/msr.h>		#include <asm/msr.h>
	#include <asm/processor-flags.h>		#include <asm/processor-flags.h>
	@@ -35,9 +35,7 @@

	.section ".text.head"		.section ".text.head"
	.code32		.code32
	.globl startup_32		ENTRY(startup_32)

	startup_32:
	cld		cld
	/* test KEEP_SEGMENTS flag to see if the bootloader is asking		/* test KEEP_SEGMENTS flag to see if the bootloader is asking
	* us to not reload segments */		* us to not reload segments */
	@@ -176,6 +174,7 @@ startup_32:

	/* Jump from 32bit compatibility mode into 64bit mode. */		/* Jump from 32bit compatibility mode into 64bit mode. */
	lret		lret
			ENDPROC(startup_32)

	no_longmode:		no_longmode:
	/* This isn't an x86-64 CPU so hang */		/* This isn't an x86-64 CPU so hang */
	@@ -295,7 +294,6 @@ relocated:
	call decompress_kernel		call decompress_kernel
	popq %rsi		popq %rsi


	/*		/*
	* Jump to the decompressed kernel.		* Jump to the decompressed kernel.
	*/		*/

arch/x86/boot/copy.S

+14 −26

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,8 @@
	*		*
	* ----------------------------------------------------------------------- */		* ----------------------------------------------------------------------- */

			#include <linux/linkage.h>

	/*		/*
	* Memory copy routines		* Memory copy routines
	*/		*/
	@@ -15,9 +17,7 @@
	.code16gcc		.code16gcc
	.text		.text

	.globl memcpy		GLOBAL(memcpy)
	.type memcpy, @function
	memcpy:
	pushw %si		pushw %si
	pushw %di		pushw %di
	movw %ax, %di		movw %ax, %di
	@@ -31,11 +31,9 @@ memcpy:
	popw %di		popw %di
	popw %si		popw %si
	ret		ret
	.size memcpy, .-memcpy		ENDPROC(memcpy)

	.globl memset		GLOBAL(memset)
	.type memset, @function
	memset:
	pushw %di		pushw %di
	movw %ax, %di		movw %ax, %di
	movzbl %dl, %eax		movzbl %dl, %eax
	@@ -48,52 +46,42 @@ memset:
	rep; stosb		rep; stosb
	popw %di		popw %di
	ret		ret
	.size memset, .-memset		ENDPROC(memset)

	.globl copy_from_fs		GLOBAL(copy_from_fs)
	.type copy_from_fs, @function
	copy_from_fs:
	pushw %ds		pushw %ds
	pushw %fs		pushw %fs
	popw %ds		popw %ds
	call memcpy		call memcpy
	popw %ds		popw %ds
	ret		ret
	.size copy_from_fs, .-copy_from_fs		ENDPROC(copy_from_fs)

	.globl copy_to_fs		GLOBAL(copy_to_fs)
	.type copy_to_fs, @function
	copy_to_fs:
	pushw %es		pushw %es
	pushw %fs		pushw %fs
	popw %es		popw %es
	call memcpy		call memcpy
	popw %es		popw %es
	ret		ret
	.size copy_to_fs, .-copy_to_fs		ENDPROC(copy_to_fs)

	#if 0 /* Not currently used, but can be enabled as needed */		#if 0 /* Not currently used, but can be enabled as needed */
			GLOBAL(copy_from_gs)
	.globl copy_from_gs
	.type copy_from_gs, @function
	copy_from_gs:
	pushw %ds		pushw %ds
	pushw %gs		pushw %gs
	popw %ds		popw %ds
	call memcpy		call memcpy
	popw %ds		popw %ds
	ret		ret
	.size copy_from_gs, .-copy_from_gs		ENDPROC(copy_from_gs)
	.globl copy_to_gs

	.type copy_to_gs, @function		GLOBAL(copy_to_gs)
	copy_to_gs:
	pushw %es		pushw %es
	pushw %gs		pushw %gs
	popw %es		popw %es
	call memcpy		call memcpy
	popw %es		popw %es
	ret		ret
	.size copy_to_gs, .-copy_to_gs		ENDPROC(copy_to_gs)

	#endif		#endif

arch/x86/boot/header.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,7 @@
	#include <linux/utsrelease.h>		#include <linux/utsrelease.h>
	#include <asm/boot.h>		#include <asm/boot.h>
	#include <asm/e820.h>		#include <asm/e820.h>
	#include <asm/page.h>		#include <asm/page_types.h>
	#include <asm/setup.h>		#include <asm/setup.h>
	#include "boot.h"		#include "boot.h"
	#include "offsets.h"		#include "offsets.h"

arch/x86/boot/pmjump.S

+5 −11

Original line number	Original line	Diff line number	Diff line
	@@ -15,18 +15,15 @@
	#include <asm/boot.h>		#include <asm/boot.h>
	#include <asm/processor-flags.h>		#include <asm/processor-flags.h>
	#include <asm/segment.h>		#include <asm/segment.h>
			#include <linux/linkage.h>

	.text		.text

	.globl protected_mode_jump
	.type protected_mode_jump, @function

	.code16		.code16

	/*		/*
	* void protected_mode_jump(u32 entrypoint, u32 bootparams);		* void protected_mode_jump(u32 entrypoint, u32 bootparams);
	*/		*/
	protected_mode_jump:		GLOBAL(protected_mode_jump)
	movl %edx, %esi # Pointer to boot_params table		movl %edx, %esi # Pointer to boot_params table

	xorl %ebx, %ebx		xorl %ebx, %ebx
	@@ -47,12 +44,10 @@ protected_mode_jump:
	.byte 0x66, 0xea # ljmpl opcode		.byte 0x66, 0xea # ljmpl opcode
	2: .long in_pm32 # offset		2: .long in_pm32 # offset
	.word __BOOT_CS # segment		.word __BOOT_CS # segment
			ENDPROC(protected_mode_jump)
	.size protected_mode_jump, .-protected_mode_jump

	.code32		.code32
	.type in_pm32, @function		GLOBAL(in_pm32)
	in_pm32:
	# Set up data segments for flat 32-bit mode		# Set up data segments for flat 32-bit mode
	movl %ecx, %ds		movl %ecx, %ds
	movl %ecx, %es		movl %ecx, %es
	@@ -78,5 +73,4 @@ in_pm32:
	lldt %cx		lldt %cx

	jmpl *%eax # Jump to the 32-bit entrypoint		jmpl *%eax # Jump to the 32-bit entrypoint
			ENDPROC(in_pm32)
	.size in_pm32, .-in_pm32