x86/kbuild for v2.6.31
Subsystems (4)
Linus,
Please pull the latest x86-kbuild-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-kbuild-for-linus
A difficult unification, lots of cleanups and future-proofing - plus fixes for relocatable kernels. This topic branch had three regressions.
out-of-topic modifications in x86-kbuild-for-linus:
---------------------------------------------------
kernel/sysctl.c # 5031296: x86: add extension fields for boo scripts/Makefile.lib # d3dd3b5: kbuild: allow compressors (gzip, scripts/bin_size # d3dd3b5: kbuild: allow compressors (gzip,
Thanks,
Ingo
------------------>
H. Peter Anvin (26):
x86, boot: align the .bss section in the decompressor
kbuild: allow compressors (gzip, bzip2, lzma) to take multiple inputs
x86: add a Kconfig symbol for when relocations are needed x86, boot: simplify arch/x86/boot/compressed/Makefile x86, boot: follow standard Kbuild style for compression suffix x86, boot: use BP_scratch in arch/x86/boot/compressed/head_*.S x86, boot: stylistic cleanups for boot/compressed/head_32.S x86, boot: stylistic cleanups for boot/compressed/head_64.S x86, boot: straighten out ranges to copy/zero in compressed/head*.S x86, boot: set up the decompression stack as early as possible x86, boot: zero EFLAGS on 32 bits
x86, boot: use appropriate rep string for move and clear x86, boot: determine compressed code offset at compile time x86, boot: make symbols from the main vmlinux available x86, boot: use LOAD_PHYSICAL_ADDR on 64 bits
x86, boot: remove dead code from boot/compressed/head_*.S x86, boot: make kernel_alignment adjustable; new bzImage fields
x86: document new bzImage fields
x86: default CONFIG_PHYSICAL_START and CONFIG_PHYSICAL_ALIGN to 16 MB
x86: make CONFIG_RELOCATABLE the default
x86, defconfig: update to current, no material changes x86, defconfig: update kernel position parameters
x86: add extension fields for bootloader type and version x86, boot: correct sanity checks in boot/compressed/misc.c
x86-64: align __PHYSICAL_START, remove __KERNEL_ALIGN x86, boot: correct the calculation of ZO_INIT_SIZE
Ingo Molnar (2):
x86, vmlinux.lds: add copyright
x86, vmlinux.lds: fix relocatable symbols
Linus Torvalds (1):
x86: unify arch/x86/boot/compressed/vmlinux_*.lds
Mike Galbraith (1):
x86, boot: add new generated files to the appropriate .gitignore files
Sam Ravnborg (16):
x86: standardize Kbuild rules
x86: beautify vmlinux_64.lds.S
x86: beautify vmlinux_32.lds.S
x86, vmlinux.lds: unify header/footer
x86, vmlinux.lds: unify PHDRS
x86, vmlinux.lds: unify start/end of SECTIONS
x86, vmlinux.lds: unify .text output sections
x86, vmlinux.lds: unify exception table
x86, vmlinux.lds: unify data output sections
x86, vmlinux.lds: move vsyscall output sections
x86, vmlinux.lds: unify first part of initdata
x86, vmlinux.lds: unify parainstructions
x86, vmlinux.lds: unify .exit.* and .init.ramfs
x86, vmlinux.lds: unify percpu
x86, vmlinux.lds: unify remaining parts
x86: boot/compressed/vmlinux.lds.S: fix build of bzImage with 64 bit compiler
Documentation/x86/boot.txt | 122 ++++++-
arch/x86/Kbuild | 16 +
arch/x86/Kconfig | 41 ++-
arch/x86/Makefile | 19 +-
arch/x86/boot/.gitignore | 2 +
arch/x86/boot/Makefile | 24 +-
arch/x86/boot/compressed/.gitignore | 3 +
arch/x86/boot/compressed/Makefile | 54 +--
arch/x86/boot/compressed/head_32.S | 194 +++++-----
arch/x86/boot/compressed/head_64.S | 169 ++++----
arch/x86/boot/compressed/misc.c | 12 +-
arch/x86/boot/compressed/mkpiggy.c | 97 +++++
.../compressed/{vmlinux_64.lds => vmlinux.lds.S} | 29 +-
arch/x86/boot/compressed/vmlinux.scr | 10 -
arch/x86/boot/compressed/vmlinux_32.lds | 43 --
arch/x86/boot/header.S | 28 +-
arch/x86/configs/i386_defconfig | 148 ++++++--
arch/x86/configs/x86_64_defconfig | 150 +++++--
arch/x86/include/asm/boot.h | 15 +
arch/x86/include/asm/bootparam.h | 3 +-
arch/x86/include/asm/page_64_types.h | 14 +-
arch/x86/include/asm/processor.h | 1 +
arch/x86/kernel/asm-offsets_32.c | 1 +
arch/x86/kernel/asm-offsets_64.c | 1 +
arch/x86/kernel/head_32.S | 7 -
arch/x86/kernel/setup.c | 10 +-
arch/x86/kernel/vmlinux.lds.S | 430 +++++++++++++++++++-
arch/x86/kernel/vmlinux_32.lds.S | 229 -----------
arch/x86/kernel/vmlinux_64.lds.S | 298 --------------
kernel/sysctl.c | 8 +
scripts/Makefile.lib | 28 +-
scripts/bin_size | 10 -
32 files changed, 1235 insertions(+), 981 deletions(-)
create mode 100644 arch/x86/Kbuild
create mode 100644 arch/x86/boot/compressed/mkpiggy.c
rename arch/x86/boot/compressed/{vmlinux_64.lds => vmlinux.lds.S} (57%)
delete mode 100644 arch/x86/boot/compressed/vmlinux.scr
delete mode 100644 arch/x86/boot/compressed/vmlinux_32.lds
delete mode 100644 arch/x86/kernel/vmlinux_32.lds.S
delete mode 100644 arch/x86/kernel/vmlinux_64.lds.S
delete mode 100644 scripts/bin_sizeDocumentation/x86/boot.txt +114 -8
@@ -50,6 +50,10 @@ Protocol 2.08: (Kernel 2.6.26) Added crc32 checksum and ELF format Protocol 2.09: (Kernel 2.6.26) Added a field of 64-bit physical pointer to single linked list of struct setup_data. +Protocol 2.10: (Kernel 2.6.31) Added a protocol for relaxed alignment + beyond the kernel_alignment added, new init_size and + pref_address fields. Added extended boot loader IDs. + **** MEMORY LAYOUT The traditional memory map for the kernel loader, used for Image or
@@ -168,12 +172,13 @@ Offset Proto Name Meaning 021C/4 2.00+ ramdisk_size initrd size (set by boot loader) 0220/4 2.00+ bootsect_kludge DO NOT USE - for bootsect.S use only 0224/2 2.01+ heap_end_ptr Free memory after setup end -0226/2 N/A pad1 Unused +0226/1 2.02+(3 ext_loader_ver Extended boot loader version +0227/1 2.02+(3 ext_loader_type Extended boot loader ID 0228/4 2.02+ cmd_line_ptr 32-bit pointer to the kernel command line 022C/4 2.03+ ramdisk_max Highest legal initrd address 0230/4 2.05+ kernel_alignment Physical addr alignment required for kernel 0234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not -0235/1 N/A pad2 Unused +0235/1 2.10+ min_alignment Minimum alignment, as a power of two 0236/2 N/A pad3 Unused 0238/4 2.06+ cmdline_size Maximum size of the kernel command line 023C/4 2.07+ hardware_subarch Hardware subarchitecture
@@ -182,6 +187,8 @@ Offset Proto Name Meaning 024C/4 2.08+ payload_length Length of kernel payload 0250/8 2.09+ setup_data 64-bit physical pointer to linked list of struct setup_data +0258/8 2.10+ pref_address Preferred loading address +0260/4 2.10+ init_size Linear memory required during initialization (1) For backwards compatibility, if the setup_sects field contains 0, the real value is 4.
@@ -190,6 +197,8 @@ Offset Proto Name Meaning field are unusable, which means the size of a bzImage kernel cannot be determined. +(3) Ignored, but safe to set, for boot protocols 2.02-2.09. + If the "HdrS" (0x53726448) magic number is not found at offset 0x202, the boot protocol version is "old". Loading an old kernel, the following parameters should be assumed:
@@ -343,18 +352,32 @@ Protocol: 2.00+ 0xTV here, where T is an identifier for the boot loader and V is a version number. Otherwise, enter 0xFF here. + For boot loader IDs above T = 0xD, write T = 0xE to this field and + write the extended ID minus 0x10 to the ext_loader_type field. + Similarly, the ext_loader_ver field can be used to provide more than + four bits for the bootloader version. + + For example, for T = 0x15, V = 0x234, write: + + type_of_loader <- 0xE4 + ext_loader_type <- 0x05 + ext_loader_ver <- 0x23 + Assigned boot loader ids: 0 LILO (0x00 reserved for pre-2.00 bootloader) 1 Loadlin 2 bootsect-loader (0x20, all other values reserved) - 3 SYSLINUX - 4 EtherBoot + 3 Syslinux + 4 Etherboot/gPXE 5 ELILO 7 GRUB - 8 U-BOOT + 8 U-Boot 9 Xen A Gujin B Qemu + C Arcturus Networks uCbootloader + E Extended (see ext_loader_type) + F Special (0xFF = undefined) Please contact <[email protected]> if you need a bootloader ID value assigned.
@@ -453,6 +476,35 @@ Protocol: 2.01+ Set this field to the offset (from the beginning of the real-mode code) of the end of the setup stack/heap, minus 0x0200. +Field name: ext_loader_ver +Type: write (optional) +Offset/size: 0x226/1 +Protocol: 2.02+ + + This field is used as an extension of the version number in the + type_of_loader field. The total version number is considered to be + (type_of_loader & 0x0f) + (ext_loader_ver << 4). + + The use of this field is boot loader specific. If not written, it + is zero. + + Kernels prior to 2.6.31 did not recognize this field, but it is safe + to write for protocol version 2.02 or higher. + +Field name: ext_loader_type +Type: write (obligatory if (type_of_loader & 0xf0) == 0xe0) +Offset/size: 0x227/1 +Protocol: 2.02+ + + This field is used as an extension of the type number in + type_of_loader field. If the type in type_of_loader is 0xE, then + the actual type is (ext_loader_type + 0x10). + + This field is ignored if the type in type_of_loader is not 0xE. + + Kernels prior to 2.6.31 did not recognize this field, but it is safe + to write for protocol version 2.02 or higher. + Field name: cmd_line_ptr Type: write (obligatory) Offset/size: 0x228/4
@@ -482,11 +534,19 @@ Protocol: 2.03+ 0x37FFFFFF, you can start your ramdisk at 0x37FE0000.) Field name: kernel_alignment -Type: read (reloc) +Type: read/modify (reloc) Offset/size: 0x230/4 -Protocol: 2.05+ +Protocol: 2.05+ (read), 2.10+ (modify) + + Alignment unit required by the kernel (if relocatable_kernel is + true.) A relocatable kernel that is loaded at an alignment + incompatible with the value in this field will be realigned during + kernel initialization. - Alignment unit required by the kernel (if relocatable_kernel is true.) + Starting with protocol version 2.10, this reflects the kernel + alignment preferred for optimal performance; it is possible for the + loader to modify this field to permit a lesser alignment. See the + min_alignment and pref_address field below. Field name: relocatable_kernel Type: read (reloc)
@@ -498,6 +558,22 @@ Protocol: 2.05+ After loading, the boot loader must set the code32_start field to point to the loaded code, or to a boot loader hook. +Field name: min_alignment +Type: read (reloc) +Offset/size: 0x235/1 +Protocol: 2.10+ + + This field, if nonzero, indicates as a power of two the minimum + alignment required, as opposed to preferred, by the kernel to boot. + If a boot loader makes use of this field, it should update the + kernel_alignment field with the alignment unit desired; typically: + + kernel_alignment = 1 << min_alignment + + There may be a considerable performance cost with an excessively + misaligned kernel. Therefore, a loader should typically try each + power-of-two alignment from kernel_alignment down to this alignment. + Field name: cmdline_size Type: read Offset/size: 0x238/4
@@ -582,6 +658,36 @@ Protocol: 2.09+ sure to consider the case where the linked list already contains entries. +Field name: pref_address +Type: read (reloc) +Offset/size: 0x258/8 +Protocol: 2.10+ + + This field, if nonzero, represents a preferred load address for the + kernel. A relocating bootloader should attempt to load at this + address if possible. + + A non-relocatable kernel will unconditionally move itself and to run + at this address. + +Field name: init_size +Type: read +Offset/size: 0x25c/4 + + This field indicates the amount of linear contiguous memory starting + at the kernel runtime start address that the kernel needs before it + is capable of examining its memory map. This is not the same thing + as the total amount of memory the kernel needs to boot, but it can + be used by a relocating boot loader to help select a safe load + address for the kernel. + + The kernel runtime start address is determined by the following algorithm: + + if (relocatable_kernel) + runtime_start = align_up(load_address, kernel_alignment) + else + runtime_start = pref_address + **** THE IMAGE CHECKSUM
arch/x86/Kbuild new file +16 -0
@@ -0,0 +1,16 @@ + +obj-$(CONFIG_KVM) += kvm/ + +# Xen paravirtualization support +obj-$(CONFIG_XEN) += xen/ + +# lguest paravirtualization support +obj-$(CONFIG_LGUEST_GUEST) += lguest/ + +obj-y += kernel/ +obj-y += mm/ + +obj-y += crypto/ +obj-y += vdso/ +obj-$(CONFIG_IA32_EMULATION) += ia32/ +
arch/x86/Kconfig +24 -17
74 lines not on this page · raw message
arch/x86/Makefile +2 -17
@@ -7,8 +7,6 @@ else KBUILD_DEFCONFIG := $(ARCH)_defconfig endif -core-$(CONFIG_KVM) += arch/x86/kvm/ - # BITS is used as extension for files which are available in a 32 bit # and a 64 bit version to simplify shared Makefiles. # e.g.: obj-y += foo_$(BITS).o
@@ -118,21 +116,8 @@ head-y += arch/x86/kernel/init_task.o libs-y += arch/x86/lib/ -# Sub architecture files that needs linking first -core-y += $(fcore-y) - -# Xen paravirtualization support -core-$(CONFIG_XEN) += arch/x86/xen/ - -# lguest paravirtualization support -core-$(CONFIG_LGUEST_GUEST) += arch/x86/lguest/ - -core-y += arch/x86/kernel/ -core-y += arch/x86/mm/ - -core-y += arch/x86/crypto/ -core-y += arch/x86/vdso/ -core-$(CONFIG_IA32_EMULATION) += arch/x86/ia32/ +# See arch/x86/Kbuild for content of core part of the kernel +core-y += arch/x86/ # drivers-y are linked after core-y drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/
arch/x86/boot/.gitignore +2 -0
@@ -3,6 +3,8 @@ bzImage cpustr.h mkcpustr offsets.h +voffset.h +zoffset.h setup setup.bin setup.elf
arch/x86/boot/Makefile +16 -8
@@ -86,19 +86,27 @@ $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE SETUP_OBJS = $(addprefix $(obj)/,$(setup-y)) -sed-offsets := -e 's/^00*/0/' \ - -e 's/^\([0-9a-fA-F]*\) . \(input_data\|input_data_end\)$$/\#define \2 0x\1/p' +sed-voffset := -e 's/^\([0-9a-fA-F]*\) . \(_text\|_end\)$$/\#define VO_\2 0x\1/p' -quiet_cmd_offsets = OFFSETS $@ - cmd_offsets = $(NM) $< | sed -n $(sed-offsets) > $@ +quiet_cmd_voffset = VOFFSET $@ + cmd_voffset = $(NM) $< | sed -n $(sed-voffset) > $@ -$(obj)/offsets.h: $(obj)/compressed/vmlinux FORCE - $(call if_changed,offsets) +targets += voffset.h +$(obj)/voffset.h: vmlinux FORCE + $(call if_changed,voffset) + +sed-zoffset := -e 's/^\([0-9a-fA-F]*\) . \(startup_32\|input_data\|_end\|z_.*\)$$/\#define ZO_\2 0x\1/p' + +quiet_cmd_zoffset = ZOFFSET $@ + cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@ + +targets += zoffset.h +$(obj)/zoffset.h: $(obj)/compressed/vmlinux FORCE + $(call if_changed,zoffset) -targets += offsets.h AFLAGS_header.o += -I$(obj) -$(obj)/header.o: $(obj)/offsets.h +$(obj)/header.o: $(obj)/voffset.h $(obj)/zoffset.h LDFLAGS_setup.elf := -T $(obj)/setup.elf: $(src)/setup.ld $(SETUP_OBJS) FORCE
arch/x86/boot/compressed/.gitignore +3 -0
@@ -1,3 +1,6 @@ relocs vmlinux.bin.all vmlinux.relocs +vmlinux.lds +mkpiggy +piggy.S
arch/x86/boot/compressed/Makefile +16 -38
76 lines not on this page · raw message
arch/x86/boot/compressed/head_32.S +92 -102
269 lines not on this page · raw message
arch/x86/boot/compressed/head_64.S +88 -81
280 lines not on this page · raw message
arch/x86/boot/compressed/misc.c +5 -7
@@ -325,21 +325,19 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, free_mem_ptr = heap;/* Heap */ free_mem_end_ptr = heap +BOOT_HEAP_SIZE ; +if ((unsigned long )output & (MIN_KERNEL_ALIGN -1 )) +error ("Destination address inappropriately aligned" );#ifdef CONFIG_X86_64 -if ((unsigned long )output & (__KERNEL_ALIGN -1 )) -error ("Destination address not 2M aligned" ); -if ((unsigned long )output >=0xffffffffffUL ) +if (heap >0x3fffffffffffUL )error ("Destination address too large" );#else -if ((u32 )output & (CONFIG_PHYSICAL_ALIGN -1 )) -error ("Destination address not CONFIG_PHYSICAL_ALIGN aligned" );if (heap > ((-__PAGE_OFFSET-(512 <<20 )-1 ) &0x7fffffff ))error ("Destination address too large" ); +#endif #ifndef CONFIG_RELOCATABLE -if ((u32 )output !=LOAD_PHYSICAL_ADDR ) +if ((unsigned long )output !=LOAD_PHYSICAL_ADDR )error ("Wrong destination address" );#endif -#endif if (!quiet)putstr ("\nDecompressing Linux... " );
arch/x86/boot/compressed/mkpiggy.c new file +97 -0
97 lines not on this page · raw message
arch/x86/boot/compressed/vmlinux.lds.S renamed from arch/x86/boot/compressed/vmlinux_64.lds +23 -6
@@ -1,6 +1,17 @@ -OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") +OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT) + +#undef i386 + +#include <asm/page_types.h> + +#ifdef CONFIG_X86_64 OUTPUT_ARCH(i386:x86-64) ENTRY(startup_64) +#else +OUTPUT_ARCH(i386) +ENTRY(startup_32) +#endif + SECTIONS { /* Be careful parts of head_64.S assume startup_32 is at
@@ -33,16 +44,22 @@ SECTIONS *(.data.*) _edata = . ; } + . = ALIGN(CONFIG_X86_L1_CACHE_BYTES); .bss : { _bss = . ; *(.bss) *(.bss.*) *(COMMON) - . = ALIGN(8); - _end_before_pgt = . ; - . = ALIGN(4096); - pgtable = . ; - . = . + 4096 * 6; + . = ALIGN(8); /* For convenience during zeroing */ _ebss = .; } +#ifdef CONFIG_X86_64 + . = ALIGN(PAGE_SIZE); + .pgtable : { + _pgtable = . ; + *(.pgtable) + _epgtable = . ; + } +#endif + _end = .; }
arch/x86/boot/compressed/vmlinux.scr deleted +0 -10
@@ -1,10 +0,0 @@ -SECTIONS -{ - .rodata.compressed : { - input_len = .; - LONG(input_data_end - input_data) input_data = .; - *(.data) - output_len = . - 4; - input_data_end = .; - } -}
arch/x86/boot/compressed/vmlinux_32.lds deleted +0 -43
43 lines not on this page · raw message
arch/x86/boot/header.S +22 -6
@@ -22,7 +22,8 @@ #include <asm/page_types.h> #include <asm/setup.h> #include "boot.h" -#include "offsets.h" +#include "voffset.h" +#include "zoffset.h" BOOTSEG = 0x07C0 /* original address of boot-sector */ SYSSEG = 0x1000 /* historical load address >> 4 */
@@ -115,7 +116,7 @@ _start: # Part 2 of the header, from the old setup.S .ascii "HdrS" # header signature - .word 0x0209 # header version number (>= 0x0105) + .word 0x020a # header version number (>= 0x0105) # or else old loadlin-1.5 will fail) .globl realmode_swtch realmode_swtch: .word 0, 0 # default_switch, SETUPSEG
@@ -168,7 +169,11 @@ heap_end_ptr: .word _end+STACK_SIZE-512 # end of setup code can be used by setup # for local heap purposes. -pad1: .word 0 +ext_loader_ver: + .byte 0 # Extended boot loader version +ext_loader_type: + .byte 0 # Extended boot loader type + cmd_line_ptr: .long 0 # (Header version 0x0202 or later) # If nonzero, a 32-bit pointer # to the kernel command line.
@@ -200,7 +205,7 @@ relocatable_kernel: .byte 1 #else relocatable_kernel: .byte 0 #endif -pad2: .byte 0 +min_alignment: .byte MIN_KERNEL_ALIGN_LG2 # minimum alignment pad3: .word 0 cmdline_size: .long COMMAND_LINE_SIZE-1 #length of the command line,
@@ -212,13 +217,24 @@ hardware_subarch: .long 0 # subarchitecture, added with 2.07 hardware_subarch_data: .quad 0 -payload_offset: .long input_data -payload_length: .long input_data_end-input_data +payload_offset: .long ZO_input_data +payload_length: .long ZO_z_input_len setup_data: .quad 0 # 64-bit physical pointer to # single linked list of # struct setup_data +pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr + +#define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) +#define VO_INIT_SIZE (VO__end - VO__text) +#if ZO_INIT_SIZE > VO_INIT_SIZE +#define INIT_SIZE ZO_INIT_SIZE +#else +#define INIT_SIZE VO_INIT_SIZE +#endif +init_size: .long INIT_SIZE # kernel initialization size + # End of setup header ##################################################### .section ".inittext", "ax"
arch/x86/configs/i386_defconfig +114 -34
616 lines not on this page · raw message
arch/x86/configs/x86_64_defconfig +113 -37
617 lines not on this page · raw message
arch/x86/include/asm/boot.h +15 -0
@@ -8,11 +8,26 @@#ifdef __KERNEL__ +#include <asm/page_types.h> +/* Physical address where kernel should be loaded. */ #define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \ + (CONFIG_PHYSICAL_ALIGN - 1)) \ & ~(CONFIG_PHYSICAL_ALIGN - 1)) +/* Minimum kernel alignment, as a power of two */ +#ifdef CONFIG_x86_64 +#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT +#else +#define MIN_KERNEL_ALIGN_LG2 (PAGE_SHIFT+1) +#endif +#define MIN_KERNEL_ALIGN (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2) + +#if (CONFIG_PHYSICAL_ALIGN & (CONFIG_PHYSICAL_ALIGN -1 )) || \ + (CONFIG_PHYSICAL_ALIGN < (_AC (1 ,UL ) <<MIN_KERNEL_ALIGN_LG2 )) +#error "Invalid value for CONFIG_PHYSICAL_ALIGN" +#endif +#ifdef CONFIG_KERNEL_BZIP2 #define BOOT_HEAP_SIZE 0x400000#else /* !CONFIG_KERNEL_BZIP2 */
arch/x86/include/asm/bootparam.h +2 -1
@@ -50,7 +50,8 @@ struct setup_header {__u32 ramdisk_size;__u32 bootsect_kludge;__u16 heap_end_ptr; -__u16 _pad1; +__u8 ext_loader_ver; +__u8 ext_loader_type;__u32 cmd_line_ptr;__u32 initrd_addr_max;__u32 kernel_alignment;
arch/x86/include/asm/page_64_types.h +3 -11
@@ -32,17 +32,9 @@*/ #define __PAGE_OFFSET _AC(0xffff880000000000, UL) -#define __PHYSICAL_START CONFIG_PHYSICAL_START -#define __KERNEL_ALIGN 0x200000 - -/* -* Make sure kernel is aligned to 2MB address. Catching it at compile -* time is better. Change your config file and compile the kernel -* for a 2MB aligned address (CONFIG_PHYSICAL_START) -*/ -#if (CONFIG_PHYSICAL_START % __KERNEL_ALIGN) !=0 -#error "CONFIG_PHYSICAL_START must be a multiple of 2MB" -#endif +#define __PHYSICAL_START ((CONFIG_PHYSICAL_START + \ + (CONFIG_PHYSICAL_ALIGN - 1)) & \ + ~(CONFIG_PHYSICAL_ALIGN - 1))#define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START)#define __START_KERNEL_map _AC(0xffffffff80000000, UL)
arch/x86/include/asm/processor.h +1 -0
@@ -814,6 +814,7 @@ extern unsigned int BIOS_revision;/* Boot loader type from the setup header: */ extern int bootloader_type; +extern int bootloader_version;extern char ignore_fpu_irq;
arch/x86/kernel/asm-offsets_32.c +1 -0
@@ -146,4 +146,5 @@ void foo(void)OFFSET (BP_loadflags, boot_params, hdr.loadflags);OFFSET (BP_hardware_subarch, boot_params, hdr.hardware_subarch);OFFSET (BP_version, boot_params, hdr.version); +OFFSET (BP_kernel_alignment, boot_params, hdr.kernel_alignment); }
arch/x86/kernel/asm-offsets_64.c +1 -0
@@ -125,6 +125,7 @@ int main(void)OFFSET (BP_loadflags, boot_params, hdr.loadflags);OFFSET (BP_hardware_subarch, boot_params, hdr.hardware_subarch);OFFSET (BP_version, boot_params, hdr.version); +OFFSET (BP_kernel_alignment, boot_params, hdr.kernel_alignment);BLANK ();DEFINE (PAGE_SIZE_asm,PAGE_SIZE );
arch/x86/kernel/head_32.S +0 -7
@@ -608,13 +608,6 @@ ignore_int: ENTRY(initial_code) .long i386_start_kernel -.section .text -/* - * Real beginning of normal "text" segment - */ -ENTRY(stext) -ENTRY(_stext) - /* * BSS section */
arch/x86/kernel/setup.c +8 -2
@@ -214,8 +214,8 @@ unsigned long mmu_cr4_features;unsigned long mmu_cr4_features =X86_CR4_PAE ;#endif -/* Boot loader ID as an integer, for the benefit of proc_dointvec */ -int bootloader_type; +/* Boot loader ID and version as integers, for the benefit of proc_dointvec */ +int bootloader_type, bootloader_version;/* * Setup options
@@ -706,6 +706,12 @@ void __init setup_arch(char **cmdline_p)#endif saved_video_mode = boot_params.hdr.vid_mode; bootloader_type = boot_params.hdr.type_of_loader; +if ((bootloader_type >>4 ) ==0xe ) { + bootloader_type &=0xf ; + bootloader_type |= (boot_params.hdr.ext_loader_type+0x10 ) <<4 ; + } + bootloader_version = bootloader_type &0xf ; + bootloader_version |= boot_params.hdr.ext_loader_ver <<4 ;#ifdef CONFIG_BLK_DEV_RAM rd_image_start = boot_params.hdr.ram_size &RAMDISK_IMAGE_START_MASK ;
arch/x86/kernel/vmlinux.lds.S +428 -2
388 lines not on this page · raw message
arch/x86/kernel/vmlinux_32.lds.S deleted +0 -229
229 lines not on this page · raw message
arch/x86/kernel/vmlinux_64.lds.S deleted +0 -298
298 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.