mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-19 14:08:17 +02:00
9261e7447e
This makes the patches which were just copied in the previous commit apply on top of kernel 4.19. The patches in the backports-4.19 folder were checked if they are really in kernel 4.19 based on the title and only removed if they were found in the upstream kernel. The following additional patches form the pending folder went into upstream Linux 4.19: pending-4.19/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch pending-4.19/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch pending-4.19/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch pending-4.19/479-mtd-spi-nor-add-eon-en25qh32.patch pending-4.19/950-tty-serial-exar-generalize-rs485-setup.patch pending-4.19/340-MIPS-mm-remove-mips_dma_mapping_error.patch Bigger changes were introduced to the m25p80 spi nor driver, as far as I saw it in the new code, it now has the functionality provided in this patch: pending-4.19/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch Part of this patch went upstream independent of OpenWrt: hack-4.19/220-gc_sections.patch This patch was reworked to match the changes done upstream. The MIPS DMA API changed a lot, this patch was rewritten to match the new DMA handling: pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch I did bigger manual changes to the following patches and I am not 100% sure if they are all correct: pending-4.19/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch pending-4.19/411-mtd-partial_eraseblock_write.patch pending-4.19/600-netfilter_conntrack_flush.patch pending-4.19/611-netfilter_match_bypass_default_table.patch pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch hack-4.19/211-host_tools_portability.patch hack-4.19/221-module_exports.patch hack-4.19/321-powerpc_crtsavres_prereq.patch hack-4.19/902-debloat_proc.patch This is based on patchset from Marko Ratkaj <marko.ratkaj@sartura.hr> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
--- a/arch/x86/Kconfig.debug
|
|
+++ b/arch/x86/Kconfig.debug
|
|
@@ -276,20 +276,6 @@ config CPA_DEBUG
|
|
---help---
|
|
Do change_page_attr() self-tests every 30 seconds.
|
|
|
|
-config OPTIMIZE_INLINING
|
|
- bool "Allow gcc to uninline functions marked 'inline'"
|
|
- ---help---
|
|
- This option determines if the kernel forces gcc to inline the functions
|
|
- developers have marked 'inline'. Doing so takes away freedom from gcc to
|
|
- do what it thinks is best, which is desirable for the gcc 3.x series of
|
|
- compilers. The gcc 4.x series have a rewritten inlining algorithm and
|
|
- enabling this option will generate a smaller kernel there. Hopefully
|
|
- this algorithm is so good that allowing gcc 4.x and above to make the
|
|
- decision will become the default in the future. Until then this option
|
|
- is there to test gcc for this.
|
|
-
|
|
- If unsure, say N.
|
|
-
|
|
config DEBUG_ENTRY
|
|
bool "Debug low-level entry code"
|
|
depends on DEBUG_KERNEL
|
|
--- a/lib/Kconfig.debug
|
|
+++ b/lib/Kconfig.debug
|
|
@@ -150,6 +150,20 @@ endmenu # "printk and dmesg options"
|
|
|
|
menu "Compile-time checks and compiler options"
|
|
|
|
+config OPTIMIZE_INLINING
|
|
+ bool "Allow gcc to uninline functions marked 'inline'"
|
|
+ ---help---
|
|
+ This option determines if the kernel forces gcc to inline the functions
|
|
+ developers have marked 'inline'. Doing so takes away freedom from gcc to
|
|
+ do what it thinks is best, which is desirable for the gcc 3.x series of
|
|
+ compilers. The gcc 4.x series have a rewritten inlining algorithm and
|
|
+ enabling this option will generate a smaller kernel there. Hopefully
|
|
+ this algorithm is so good that allowing gcc 4.x and above to make the
|
|
+ decision will become the default in the future. Until then this option
|
|
+ is there to test gcc for this.
|
|
+
|
|
+ If unsure, say N.
|
|
+
|
|
config DEBUG_INFO
|
|
bool "Compile the kernel with debug info"
|
|
depends on DEBUG_KERNEL && !COMPILE_TEST
|
|
--- a/arch/x86/Kconfig
|
|
+++ b/arch/x86/Kconfig
|
|
@@ -306,9 +306,6 @@ config ZONE_DMA32
|
|
config AUDIT_ARCH
|
|
def_bool y if X86_64
|
|
|
|
-config ARCH_SUPPORTS_OPTIMIZED_INLINING
|
|
- def_bool y
|
|
-
|
|
config ARCH_SUPPORTS_DEBUG_PAGEALLOC
|
|
def_bool y
|
|
|
|
--- a/include/linux/compiler_types.h
|
|
+++ b/include/linux/compiler_types.h
|
|
@@ -260,8 +260,7 @@ struct ftrace_likely_data {
|
|
* of extern inline functions at link time.
|
|
* A lot of inline functions can cause havoc with function tracing.
|
|
*/
|
|
-#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \
|
|
- !defined(CONFIG_OPTIMIZE_INLINING)
|
|
+#if !defined(CONFIG_OPTIMIZE_INLINING)
|
|
#define inline \
|
|
inline __attribute__((always_inline, unused)) notrace __gnu_inline
|
|
#else
|