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

Commit 2a43f3ed authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Andi Kleen
Browse files

[PATCH] i386: CONFIG_PHYSICAL_START cleanup 



Defining __PHYSICAL_START and __KERNEL_START in asm-i386/page.h works but
it triggers a full kernel rebuild for the silliest of reasons.  This
modifies the users to directly use CONFIG_PHYSICAL_START and linux/config.h
which prevents the full rebuild problem, which makes the code much
more maintainer and hopefully user friendly.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarVivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 8621b81c

arch/i386/boot/compressed/head.S

+3 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 


#include <linux/linkage.h>

#include <asm/segment.h>

#include <asm/page.h>



	.globl startup_32
@@ -75,7 +74,7 @@ startup_32: 
	popl %esi	# discard address

	popl %esi	# real mode pointer

	xorl %ebx,%ebx

	ljmp $(__BOOT_CS), $__PHYSICAL_START

	ljmp $(__BOOT_CS), $CONFIG_PHYSICAL_START



/*

 * We come here, if we were loaded high.
@@ -100,7 +99,7 @@ startup_32: 
	popl %ecx	# lcount

	popl %edx	# high_buffer_start

	popl %eax	# hcount

	movl $__PHYSICAL_START,%edi

	movl $CONFIG_PHYSICAL_START,%edi

	cli		# make sure we don't get interrupted

	ljmp $(__BOOT_CS), $0x1000 # and jump to the move routine
@@ -125,5 +124,5 @@ move_routine_start: 
	movsl

	movl %ebx,%esi	# Restore setup pointer

	xorl %ebx,%ebx

	ljmp $(__BOOT_CS), $__PHYSICAL_START

	ljmp $(__BOOT_CS), $CONFIG_PHYSICAL_START

move_routine_end:

arch/i386/boot/compressed/misc.c

+3 −4
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/vmalloc.h>

#include <linux/screen_info.h>

#include <asm/io.h>

#include <asm/page.h>



/*

 * gzip declarations
@@ -303,7 +302,7 @@ static void setup_normal_output_buffer(void) 
#else

	if ((RM_ALT_MEM_K > RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) < 1024) error("Less than 2MB of memory");

#endif

	output_data = (unsigned char *)__PHYSICAL_START; /* Normally Points to 1M */

	output_data = (unsigned char *)CONFIG_PHYSICAL_START; /* Normally Points to 1M */

	free_mem_end_ptr = (long)real_mode;

}
@@ -326,8 +325,8 @@ static void setup_output_buffer_if_we_run_high(struct moveparams *mv) 
	low_buffer_size = low_buffer_end - LOW_BUFFER_START;

	high_loaded = 1;

	free_mem_end_ptr = (long)high_buffer_start;

	if ( (__PHYSICAL_START + low_buffer_size) > ((ulg)high_buffer_start)) {

		high_buffer_start = (uch *)(__PHYSICAL_START + low_buffer_size);

	if ( (CONFIG_PHYSICAL_START + low_buffer_size) > ((ulg)high_buffer_start)) {

		high_buffer_start = (uch *)(CONFIG_PHYSICAL_START + low_buffer_size);

		mv->hcount = 0; /* say: we need not to move high_buffer */

	}

	else mv->hcount = -1;

arch/i386/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ PHDRS { 
}

SECTIONS

{

  . = __KERNEL_START;

  . = LOAD_OFFSET + CONFIG_PHYSICAL_START;

  phys_startup_32 = startup_32 - LOAD_OFFSET;

  /* read-only */

  .text : AT(ADDR(.text) - LOAD_OFFSET) {

include/asm-i386/page.h

+0 −3
Original line number Diff line number Diff line
@@ -112,12 +112,9 @@ extern int page_is_ram(unsigned long pagenr); 


#ifdef __ASSEMBLY__

#define __PAGE_OFFSET		CONFIG_PAGE_OFFSET

#define __PHYSICAL_START	CONFIG_PHYSICAL_START

#else

#define __PAGE_OFFSET		((unsigned long)CONFIG_PAGE_OFFSET)

#define __PHYSICAL_START	((unsigned long)CONFIG_PHYSICAL_START)

#endif

#define __KERNEL_START		(__PAGE_OFFSET + __PHYSICAL_START)





#define PAGE_OFFSET		((unsigned long)__PAGE_OFFSET)