Update to 4.9-rc8
This commit is contained in:
Ben Hutchings
parent
cb8d2ff783
commit
1c1ab88dbe
|
|
@ -1,5 +1,8 @@
|
|||
linux (4.9~rc7-1~exp2) UNRELEASED; urgency=medium
|
||||
linux (4.9~rc8-1~exp1) UNRELEASED; urgency=medium
|
||||
|
||||
* New upstream release candidate
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* radeon: Update package name in error message for missing firmware
|
||||
* [amd64] Remove xen-linux-system-<version> package
|
||||
* debian/control: Fix build-dependency on flex to work with new versions
|
||||
|
|
|
|||
|
|
@ -1,57 +0,0 @@
|
|||
From: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
Date: Tue, 29 Nov 2016 15:20:14 -0800
|
||||
Subject: Re-enable CONFIG_MODVERSIONS in a slightly weaker form
|
||||
Origin: https://git.kernel.org/linus/faaae2a581435f32781a105dda3501df388fddcb
|
||||
|
||||
This enables CONFIG_MODVERSIONS again, but allows for missing symbol CRC
|
||||
information in order to work around the issue that newer binutils
|
||||
versions seem to occasionally drop the CRC on the floor. binutils 2.26
|
||||
seems to work fine, while binutils 2.27 seems to break MODVERSIONS of
|
||||
symbols that have been defined in assembler files.
|
||||
|
||||
[ We've had random missing CRC's before - it may be an old problem that
|
||||
just is now reliably triggered with the weak asm symbols and a new
|
||||
version of binutils ]
|
||||
|
||||
Some day I really do want to remove MODVERSIONS entirely. Sadly, today
|
||||
does not appear to be that day: Debian people apparently do want the
|
||||
option to enable MODVERSIONS to make it easier to have external modules
|
||||
across kernel versions, and this seems to be a fairly minimal fix for
|
||||
the annoying problem.
|
||||
|
||||
Cc: Ben Hutchings <ben@decadent.org.uk>
|
||||
Acked-by: Michal Marek <mmarek@suse.com>
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
init/Kconfig | 1 -
|
||||
kernel/module.c | 5 +++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/init/Kconfig b/init/Kconfig
|
||||
index c4fbc1e55c25..34407f15e6d3 100644
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -1945,7 +1945,6 @@ config MODULE_FORCE_UNLOAD
|
||||
|
||||
config MODVERSIONS
|
||||
bool "Module versioning support"
|
||||
- depends on BROKEN
|
||||
help
|
||||
Usually, you have to use modules compiled with your kernel.
|
||||
Saying Y here makes it sometimes possible to use modules
|
||||
diff --git a/kernel/module.c b/kernel/module.c
|
||||
index f57dd63186e6..0e54d5bf0097 100644
|
||||
--- a/kernel/module.c
|
||||
+++ b/kernel/module.c
|
||||
@@ -1301,8 +1301,9 @@ static int check_version(Elf_Shdr *sechdrs,
|
||||
goto bad_version;
|
||||
}
|
||||
|
||||
- pr_warn("%s: no symbol version for %s\n", mod->name, symname);
|
||||
- return 0;
|
||||
+ /* Broken toolchain. Warn once, then let it go.. */
|
||||
+ pr_warn_once("%s: no symbol version for %s\n", mod->name, symname);
|
||||
+ return 1;
|
||||
|
||||
bad_version:
|
||||
pr_warn("%s: disagrees about version of symbol %s\n",
|
||||
|
|
@ -9,16 +9,16 @@ are set.
|
|||
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1004,7 +1004,7 @@ endif
|
||||
@@ -1024,7 +1024,7 @@ endif
|
||||
prepare2: prepare3 prepare-compiler-check outputmakefile asm-generic
|
||||
|
||||
prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
|
||||
- include/config/auto.conf
|
||||
+ include/config/auto.conf include/generated/package.h
|
||||
$(cmd_crmodverdir)
|
||||
$(Q)test -e include/generated/autoksyms.h || \
|
||||
touch include/generated/autoksyms.h
|
||||
@@ -1079,6 +1079,16 @@ define filechk_version.h
|
||||
|
||||
archprepare: archheaders archscripts prepare1 scripts_basic
|
||||
@@ -1097,6 +1097,16 @@ define filechk_version.h
|
||||
echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
|
||||
endef
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ are set.
|
|||
$(version_h): $(srctree)/Makefile FORCE
|
||||
$(call filechk,version.h)
|
||||
$(Q)rm -f $(old_version_h)
|
||||
@@ -1086,6 +1096,9 @@ $(version_h): $(srctree)/Makefile FORCE
|
||||
@@ -1104,6 +1114,9 @@ $(version_h): $(srctree)/Makefile FORCE
|
||||
include/generated/utsrelease.h: include/config/kernel.release FORCE
|
||||
$(call filechk,utsrelease.h)
|
||||
|
||||
|
|
@ -99,7 +99,7 @@ are set.
|
|||
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/io.h>
|
||||
@@ -1309,8 +1310,9 @@ void show_regs(struct pt_regs * regs)
|
||||
@@ -1340,8 +1341,9 @@ void show_regs(struct pt_regs * regs)
|
||||
|
||||
printk("NIP: "REG" LR: "REG" CTR: "REG"\n",
|
||||
regs->nip, regs->link, regs->ctr);
|
||||
|
|
@ -121,7 +121,7 @@ are set.
|
|||
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/sections.h>
|
||||
@@ -3291,11 +3292,12 @@ void __init dump_stack_set_arch_desc(con
|
||||
@@ -3282,11 +3283,12 @@ void __init dump_stack_set_arch_desc(con
|
||||
*/
|
||||
void dump_stack_print_info(const char *log_lvl)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -102,7 +102,6 @@ bugfix/alpha/revert-alpha-move-exports-to-actual-definitions.patch
|
|||
bugfix/x86/x86-kbuild-enable-modversions-for-symbols-exported-f.patch
|
||||
bugfix/powerpc/powerpc-remove-mac-on-linux-hooks.patch
|
||||
bugfix/powerpc/powerpc-fix-missing-crcs-add-yet-more-asm-prototypes.patch
|
||||
bugfix/all/re-enable-config_modversions-in-a-slightly-weaker-fo.patch
|
||||
bugfix/all/module-disable-matching-missing-version-crc.patch
|
||||
|
||||
# ABI maintenance
|
||||
|
|
|
|||
Loading…
Reference in New Issue