summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/linux-libre/0013-efistub-fix.patch177
-rw-r--r--libre/linux-libre/PKGBUILD20
-rw-r--r--libre/linux-libre/config.i6862
-rw-r--r--libre/linux-libre/config.x86_642
4 files changed, 9 insertions, 192 deletions
diff --git a/libre/linux-libre/0013-efistub-fix.patch b/libre/linux-libre/0013-efistub-fix.patch
deleted file mode 100644
index a2da3b63a..000000000
--- a/libre/linux-libre/0013-efistub-fix.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From c7fb93ec51d462ec3540a729ba446663c26a0505 Mon Sep 17 00:00:00 2001
-From: Michael Brown <mbrown@fensystems.co.uk>
-Date: Thu, 10 Jul 2014 12:26:20 +0100
-Subject: x86/efi: Include a .bss section within the PE/COFF headers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The PE/COFF headers currently describe only the initialised-data
-portions of the image, and result in no space being allocated for the
-uninitialised-data portions. Consequently, the EFI boot stub will end
-up overwriting unexpected areas of memory, with unpredictable results.
-
-Fix by including a .bss section in the PE/COFF headers (functionally
-equivalent to the init_size field in the bzImage header).
-
-Signed-off-by: Michael Brown <mbrown@fensystems.co.uk>
-Cc: Thomas Bächler <thomas@archlinux.org>
-Cc: Josh Boyer <jwboyer@fedoraproject.org>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-
-diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
-index 84c2234..7a6d43a 100644
---- a/arch/x86/boot/header.S
-+++ b/arch/x86/boot/header.S
-@@ -91,10 +91,9 @@ bs_die:
-
- .section ".bsdata", "a"
- bugger_off_msg:
-- .ascii "Direct floppy boot is not supported. "
-- .ascii "Use a boot loader program instead.\r\n"
-+ .ascii "Use a boot loader.\r\n"
- .ascii "\n"
-- .ascii "Remove disk and press any key to reboot ...\r\n"
-+ .ascii "Remove disk and press any key to reboot...\r\n"
- .byte 0
-
- #ifdef CONFIG_EFI_STUB
-@@ -108,7 +107,7 @@ coff_header:
- #else
- .word 0x8664 # x86-64
- #endif
-- .word 3 # nr_sections
-+ .word 4 # nr_sections
- .long 0 # TimeDateStamp
- .long 0 # PointerToSymbolTable
- .long 1 # NumberOfSymbols
-@@ -250,6 +249,25 @@ section_table:
- .word 0 # NumberOfLineNumbers
- .long 0x60500020 # Characteristics (section flags)
-
-+ #
-+ # The offset & size fields are filled in by build.c.
-+ #
-+ .ascii ".bss"
-+ .byte 0
-+ .byte 0
-+ .byte 0
-+ .byte 0
-+ .long 0
-+ .long 0x0
-+ .long 0 # Size of initialized data
-+ # on disk
-+ .long 0x0
-+ .long 0 # PointerToRelocations
-+ .long 0 # PointerToLineNumbers
-+ .word 0 # NumberOfRelocations
-+ .word 0 # NumberOfLineNumbers
-+ .long 0xc8000080 # Characteristics (section flags)
-+
- #endif /* CONFIG_EFI_STUB */
-
- # Kernel attributes; used by setup. This is part 1 of the
-diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c
-index 1a2f212..a7661c4 100644
---- a/arch/x86/boot/tools/build.c
-+++ b/arch/x86/boot/tools/build.c
-@@ -143,7 +143,7 @@ static void usage(void)
-
- #ifdef CONFIG_EFI_STUB
-
--static void update_pecoff_section_header(char *section_name, u32 offset, u32 size)
-+static void update_pecoff_section_header_fields(char *section_name, u32 vma, u32 size, u32 datasz, u32 offset)
- {
- unsigned int pe_header;
- unsigned short num_sections;
-@@ -164,10 +164,10 @@ static void update_pecoff_section_header(char *section_name, u32 offset, u32 siz
- put_unaligned_le32(size, section + 0x8);
-
- /* section header vma field */
-- put_unaligned_le32(offset, section + 0xc);
-+ put_unaligned_le32(vma, section + 0xc);
-
- /* section header 'size of initialised data' field */
-- put_unaligned_le32(size, section + 0x10);
-+ put_unaligned_le32(datasz, section + 0x10);
-
- /* section header 'file offset' field */
- put_unaligned_le32(offset, section + 0x14);
-@@ -179,6 +179,11 @@ static void update_pecoff_section_header(char *section_name, u32 offset, u32 siz
- }
- }
-
-+static void update_pecoff_section_header(char *section_name, u32 offset, u32 size)
-+{
-+ update_pecoff_section_header_fields(section_name, offset, size, size, offset);
-+}
-+
- static void update_pecoff_setup_and_reloc(unsigned int size)
- {
- u32 setup_offset = 0x200;
-@@ -203,9 +208,6 @@ static void update_pecoff_text(unsigned int text_start, unsigned int file_sz)
-
- pe_header = get_unaligned_le32(&buf[0x3c]);
-
-- /* Size of image */
-- put_unaligned_le32(file_sz, &buf[pe_header + 0x50]);
--
- /*
- * Size of code: Subtract the size of the first sector (512 bytes)
- * which includes the header.
-@@ -220,6 +222,22 @@ static void update_pecoff_text(unsigned int text_start, unsigned int file_sz)
- update_pecoff_section_header(".text", text_start, text_sz);
- }
-
-+static void update_pecoff_bss(unsigned int file_sz, unsigned int init_sz)
-+{
-+ unsigned int pe_header;
-+ unsigned int bss_sz = init_sz - file_sz;
-+
-+ pe_header = get_unaligned_le32(&buf[0x3c]);
-+
-+ /* Size of uninitialized data */
-+ put_unaligned_le32(bss_sz, &buf[pe_header + 0x24]);
-+
-+ /* Size of image */
-+ put_unaligned_le32(init_sz, &buf[pe_header + 0x50]);
-+
-+ update_pecoff_section_header_fields(".bss", file_sz, bss_sz, 0, 0);
-+}
-+
- static int reserve_pecoff_reloc_section(int c)
- {
- /* Reserve 0x20 bytes for .reloc section */
-@@ -259,6 +277,8 @@ static void efi_stub_entry_update(void)
- static inline void update_pecoff_setup_and_reloc(unsigned int size) {}
- static inline void update_pecoff_text(unsigned int text_start,
- unsigned int file_sz) {}
-+static inline void update_pecoff_bss(unsigned int file_sz,
-+ unsigned int init_sz) {}
- static inline void efi_stub_defaults(void) {}
- static inline void efi_stub_entry_update(void) {}
-
-@@ -310,7 +330,7 @@ static void parse_zoffset(char *fname)
-
- int main(int argc, char ** argv)
- {
-- unsigned int i, sz, setup_sectors;
-+ unsigned int i, sz, setup_sectors, init_sz;
- int c;
- u32 sys_size;
- struct stat sb;
-@@ -376,7 +396,9 @@ int main(int argc, char ** argv)
- buf[0x1f1] = setup_sectors-1;
- put_unaligned_le32(sys_size, &buf[0x1f4]);
-
-- update_pecoff_text(setup_sectors * 512, sz + i + ((sys_size * 16) - sz));
-+ update_pecoff_text(setup_sectors * 512, i + (sys_size * 16));
-+ init_sz = get_unaligned_le32(&buf[0x260]);
-+ update_pecoff_bss(i + (sys_size * 16), init_sz);
-
- efi_stub_entry_update();
-
---
-cgit v0.10.1
-
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 1de83d8b9..a90b9dc5c 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 216981 2014-07-18 05:18:53Z tpowa $
+# $Id: PKGBUILD 218257 2014-07-28 19:59:38Z thomas $
# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
# Maintainer (Arch): Thomas Baechler <thomas@archlinux.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
@@ -11,10 +11,10 @@
pkgbase=linux-libre # Build stock -libre kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.15
-_sublevel=6
+_sublevel=7
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -30,19 +30,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'Kbuild.platforms'
'boot-logo.patch'
'change-default-console-loglevel.patch'
- '0013-efistub-fix.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688'
- '1966964395bd9331843c8d6dacbf661c9061e90c81bf8609d995ed458d57e358'
- '5d56d5674977da86def67269fb7e0245e382af25ea52acbe17bc2a641a8b9b0e'
- '25b3afffe577540c8b7bf68f0a3aae5e9ac2c2b2841349a91b5048d742ba0d1f'
+ 'ffc3b2c30f38bcdaac32f2236651d1339ef4a9c2a70669938cdc1768440ce5d0'
+ 'b5e3769f14d22dc1fa574e913a10a2b06d92c046bf78063d35ff5233fd5a25e0'
+ '6a3bfcc809d4fa302b70322a6c7dff12419d881d54a8e6ddc1b80dce4388ac52'
'dfe01c93d83cdac9ca502715ceb6ac9502d327c939fec2e3052a5a58422dc176'
'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b'
'55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9'
'8303b426b1a6dce456b2350003558ae312d21cab0ae6c1f0d7b9d21395f4e177'
'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
- '937dc895b4f5948381775a75bd198ed2f157a9f356da0ab5a5006f9f1dacde5c'
- 'ca0399ad601efd926a3d6e328d6457a7e945fe982e4f13ed39fff31982082f28')
+ '38beb22b3d9f548fff897c0690dad330443ef24e48d414cf8dbc682f40501fab')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -70,10 +68,6 @@ prepare() {
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
- # fix efistub hang #33745
- # https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/patch/?id=c7fb93ec51d462ec3540a729ba446663c26a0505
- patch -Np1 -i "${srcdir}/0013-efistub-fix.patch"
-
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 7e9bd9156..734bd224a 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -457,7 +457,7 @@ CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
CONFIG_MMU_NOTIFIER=y
CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
CONFIG_MEMORY_FAILURE=y
CONFIG_HWPOISON_INJECT=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index cd305e1a8..0fa2b3a11 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -463,7 +463,7 @@ CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
CONFIG_MMU_NOTIFIER=y
CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
CONFIG_MEMORY_FAILURE=y
CONFIG_HWPOISON_INJECT=m
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 19:26:30 +0000