microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[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: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
This commit is contained in:
Eric W. Biederman 2006-12-07 02:14:04 +01:00 коммит произвёл Andi Kleen
Родитель 8621b81c74
Коммит 2a43f3ede4
4 изменённых файлов: 7 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
arch/i386/boot/compressed/head.S
Просмотреть файл

@ -25,7 +25,6 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/page.h>
.globl startup_32 .globl startup_32
@ -75,7 +74,7 @@ startup_32:
popl %esi # discard address popl %esi # discard address
popl %esi # real mode pointer popl %esi # real mode pointer
xorl %ebx,%ebx xorl %ebx,%ebx
ljmp $(__BOOT_CS), $__PHYSICAL_START ljmp $(__BOOT_CS), $CONFIG_PHYSICAL_START
/* /*
* We come here, if we were loaded high. * We come here, if we were loaded high.
@ -100,7 +99,7 @@ startup_32:
popl %ecx # lcount popl %ecx # lcount
popl %edx # high_buffer_start popl %edx # high_buffer_start
popl %eax # hcount popl %eax # hcount
movl $__PHYSICAL_START,%edi movl $CONFIG_PHYSICAL_START,%edi
cli # make sure we don't get interrupted cli # make sure we don't get interrupted
ljmp $(__BOOT_CS), $0x1000 # and jump to the move routine ljmp $(__BOOT_CS), $0x1000 # and jump to the move routine
@ -125,5 +124,5 @@ move_routine_start:
movsl movsl
movl %ebx,%esi # Restore setup pointer movl %ebx,%esi # Restore setup pointer
xorl %ebx,%ebx xorl %ebx,%ebx
ljmp $(__BOOT_CS), $__PHYSICAL_START ljmp $(__BOOT_CS), $CONFIG_PHYSICAL_START
move_routine_end: move_routine_end:

7
arch/i386/boot/compressed/misc.c
Просмотреть файл

@ -13,7 +13,6 @@
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/screen_info.h> #include <linux/screen_info.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/page.h>
/* /*
* gzip declarations * gzip declarations
@ -303,7 +302,7 @@ static void setup_normal_output_buffer(void)
#else #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"); 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 #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; 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; low_buffer_size = low_buffer_end - LOW_BUFFER_START;
high_loaded = 1; high_loaded = 1;
free_mem_end_ptr = (long)high_buffer_start; free_mem_end_ptr = (long)high_buffer_start;
if ( (__PHYSICAL_START + low_buffer_size) > ((ulg)high_buffer_start)) { if ( (CONFIG_PHYSICAL_START + low_buffer_size) > ((ulg)high_buffer_start)) {
high_buffer_start = (uch *)(__PHYSICAL_START + low_buffer_size); high_buffer_start = (uch *)(CONFIG_PHYSICAL_START + low_buffer_size);
mv->hcount = 0; /* say: we need not to move high_buffer */ mv->hcount = 0; /* say: we need not to move high_buffer */
} }
else mv->hcount = -1; else mv->hcount = -1;

2
arch/i386/kernel/vmlinux.lds.S
Просмотреть файл

@ -27,7 +27,7 @@ PHDRS {
} }
SECTIONS SECTIONS
{ {
. = __KERNEL_START; . = LOAD_OFFSET + CONFIG_PHYSICAL_START;
phys_startup_32 = startup_32 - LOAD_OFFSET; phys_startup_32 = startup_32 - LOAD_OFFSET;
/* read-only */ /* read-only */
.text : AT(ADDR(.text) - LOAD_OFFSET) { .text : AT(ADDR(.text) - LOAD_OFFSET) {

3
include/asm-i386/page.h
Просмотреть файл

@ -112,12 +112,9 @@ extern int page_is_ram(unsigned long pagenr);
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
#define __PAGE_OFFSET CONFIG_PAGE_OFFSET #define __PAGE_OFFSET CONFIG_PAGE_OFFSET
#define __PHYSICAL_START CONFIG_PHYSICAL_START
#else #else
#define __PAGE_OFFSET ((unsigned long)CONFIG_PAGE_OFFSET) #define __PAGE_OFFSET ((unsigned long)CONFIG_PAGE_OFFSET)
#define __PHYSICAL_START ((unsigned long)CONFIG_PHYSICAL_START)
#endif #endif
#define __KERNEL_START (__PAGE_OFFSET + __PHYSICAL_START)
#define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET)