Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip (fb4284b2) · Commits · e / devices / android_kernel_xiaomi_markw

arch/x86/kernel/head_32.S

+5 −3

Original line number	Diff line number	Diff line
		@@ -456,9 +456,6 @@ is386: movl $2,%ecx # set MP
		1:
		#endif /* CONFIG_SMP */
		jmp *(initial_code)
		.align 4
		ENTRY(initial_code)
		.long i386_start_kernel

		/*
		* We depend on ET to be correct. This checks for 287/387.
		@@ -601,6 +598,11 @@ ignore_int:
		#endif
		iret

		.section .cpuinit.data,"wa"
		.align 4
		ENTRY(initial_code)
		.long i386_start_kernel

		.section .text
		/*
		* Real beginning of normal "text" segment