diff options
author | graysky | 2018-08-09 15:29:03 -0400 |
---|---|---|
committer | graysky | 2018-08-09 15:29:03 -0400 |
commit | 5312804c7a84b43ef835cfbd55f1e8665ac1165b (patch) | |
tree | 5546299eb9896e2a03430b9524d6b45a69d16355 | |
parent | 97c4cee38e206efe33176171faafb0264f93d1c5 (diff) | |
download | aur-5312804c7a84b43ef835cfbd55f1e8665ac1165b.tar.gz |
Update to 4.17.11-4
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | 0001-ARCH_patches-20180809.patch | 519 | ||||
-rw-r--r-- | PKGBUILD | 30 | ||||
-rw-r--r-- | config | 10 |
4 files changed, 542 insertions, 25 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sun Aug 5 19:17:37 UTC 2018 +# Thu Aug 9 19:29:03 UTC 2018 pkgbase = linux-ck pkgver = 4.17.11 - pkgrel = 3 + pkgrel = 4 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 license = GPL2 @@ -19,14 +19,16 @@ pkgbase = linux-ck source = linux.preset source = enable_additional_cpu_optimizations-20180509.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180509.tar.gz source = http://ck.kolivas.org/patches/4.0/4.17/4.17-ck1/patch-4.17-ck1.xz + source = 0001-ARCH_patches-20180809.patch sha256sums = db1e84ed4f213b43d50f3373627b2ffcdb3b65f3430f746a38f801554ef3728c sha256sums = SKIP - sha256sums = df83502cba84c1474b69274f26f6b5810332b75bf7a4b8ac99f00afde9ca5fb9 + sha256sums = 3453b5c4c7ce4b44f611050f95488e272119539f812dfde0667fe9c66402fd9b sha256sums = 36e326d8a88b4087a3a0ee0d47643fc03baeda487659980d0e9d08791e4c729c sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 sha256sums = 226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d sha256sums = 6a0e9cce53da8c55161d01920cc02a09a3b70a60f1050ec91fafd9bb59cb6bb4 + sha256sums = f1db9d4b6051e217969ab99d8ddedde4ca48c061d89fe535c04e6b4384506955 pkgname = linux-ck pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler v0.172 diff --git a/0001-ARCH_patches-20180809.patch b/0001-ARCH_patches-20180809.patch new file mode 100644 index 000000000000..d5837aadd70f --- /dev/null +++ b/0001-ARCH_patches-20180809.patch @@ -0,0 +1,519 @@ +From 66a37293bf1ec5bf9d22ede72818099f2c72fbc1 Mon Sep 17 00:00:00 2001 +From: Serge Hallyn <serge.hallyn@canonical.com> +Date: Fri, 31 May 2013 19:12:12 +0100 +Subject: [PATCH 1/5] add sysctl to disallow unprivileged CLONE_NEWUSER by + default + +Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> +[bwh: Remove unneeded binary sysctl bits] +Signed-off-by: Daniel Micay <danielmicay@gmail.com> +--- + kernel/fork.c | 15 +++++++++++++++ + kernel/sysctl.c | 12 ++++++++++++ + kernel/user_namespace.c | 3 +++ + 3 files changed, 30 insertions(+) + +diff --git a/kernel/fork.c b/kernel/fork.c +index 5ad558e6f8fe9..767485c6f7cc4 100644 +--- a/kernel/fork.c ++++ b/kernel/fork.c +@@ -103,6 +103,11 @@ + + #define CREATE_TRACE_POINTS + #include <trace/events/task.h> ++#ifdef CONFIG_USER_NS ++extern int unprivileged_userns_clone; ++#else ++#define unprivileged_userns_clone 0 ++#endif + + /* + * Minimum number of threads to boot the kernel +@@ -1600,6 +1605,10 @@ static __latent_entropy struct task_struct *copy_process( + if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) + return ERR_PTR(-EINVAL); + ++ if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) ++ if (!capable(CAP_SYS_ADMIN)) ++ return ERR_PTR(-EPERM); ++ + /* + * Thread groups must share signals as well, and detached threads + * can only be started up within the thread group. +@@ -2394,6 +2403,12 @@ int ksys_unshare(unsigned long unshare_flags) + if (unshare_flags & CLONE_NEWNS) + unshare_flags |= CLONE_FS; + ++ if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) { ++ err = -EPERM; ++ if (!capable(CAP_SYS_ADMIN)) ++ goto bad_unshare_out; ++ } ++ + err = check_unshare_flags(unshare_flags); + if (err) + goto bad_unshare_out; +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index 6a78cf70761db..35a1d24282f4b 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -105,6 +105,9 @@ extern int core_uses_pid; + extern char core_pattern[]; + extern unsigned int core_pipe_limit; + #endif ++#ifdef CONFIG_USER_NS ++extern int unprivileged_userns_clone; ++#endif + extern int pid_max; + extern int pid_max_min, pid_max_max; + extern int percpu_pagelist_fraction; +@@ -519,6 +522,15 @@ static struct ctl_table kern_table[] = { + .proc_handler = proc_dointvec, + }, + #endif ++#ifdef CONFIG_USER_NS ++ { ++ .procname = "unprivileged_userns_clone", ++ .data = &unprivileged_userns_clone, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = proc_dointvec, ++ }, ++#endif + #ifdef CONFIG_PROC_SYSCTL + { + .procname = "tainted", +diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c +index 246d4d4ce5c70..f64432b45cec2 100644 +--- a/kernel/user_namespace.c ++++ b/kernel/user_namespace.c +@@ -26,6 +26,9 @@ + #include <linux/bsearch.h> + #include <linux/sort.h> + ++/* sysctl */ ++int unprivileged_userns_clone; ++ + static struct kmem_cache *user_ns_cachep __read_mostly; + static DEFINE_MUTEX(userns_state_mutex); + + +From 43b90cfd95ec0ffd122eff4cce103a49d132c298 Mon Sep 17 00:00:00 2001 +From: Jani Nikula <jani.nikula@intel.com> +Date: Wed, 16 May 2018 11:01:10 +0300 +Subject: [PATCH 2/5] Revert "drm/i915/edp: Allow alternate fixed mode for eDP + if available." + +This reverts commit dc911f5bd8aacfcf8aabd5c26c88e04c837a938e. + +Per the report, no matter what display mode you select with xrandr, the +i915 driver will always select the alternate fixed mode. For the +reporter this means that the display will always run at 40Hz which is +quite annoying. This may be due to the mode comparison. + +But there are some other potential issues. The choice of alt_fixed_mode +seems dubious. It's the first non-preferred mode, but there are no +guarantees that the only difference would be refresh rate. Similarly, +there may be more than one preferred mode in the probed modes list, and +the commit changes the preferred mode selection to choose the last one +on the list instead of the first. + +(Note that the probed modes list is the raw, unfiltered, unsorted list +of modes from drm_add_edid_modes(), not the pretty result after a +drm_helper_probe_single_connector_modes() call.) + +Finally, we already have eerily similar code in place to find the +downclock mode for DRRS that seems like could be reused here. + +Back to the drawing board. + +Note: This is a hand-crafted revert due to conflicts. If it fails to +backport, please just try reverting the original commit directly. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105469 +Reported-by: Rune Petersen <rune@megahurts.dk> +Reported-by: Mark Spencer <n7u4722r35@ynzlx.anonbox.net> +Fixes: dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for eDP if available.") +Cc: Clint Taylor <clinton.a.taylor@intel.com> +Cc: David Weinehall <david.weinehall@linux.intel.com> +Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> +Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> +Cc: Jani Nikula <jani.nikula@intel.com> +Cc: Chris Wilson <chris@chris-wilson.co.uk> +Cc: Jim Bride <jim.bride@linux.intel.com> +Cc: Jani Nikula <jani.nikula@linux.intel.com> +Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> +Cc: intel-gfx@lists.freedesktop.org +Cc: <stable@vger.kernel.org> # v4.14+ +Signed-off-by: Jani Nikula <jani.nikula@intel.com> +Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> +Link: https://patchwork.freedesktop.org/patch/msgid/20180516080110.22770-1-jani.nikula@intel.com +--- + drivers/gpu/drm/i915/intel_dp.c | 38 ++++-------------------------- + drivers/gpu/drm/i915/intel_drv.h | 2 -- + drivers/gpu/drm/i915/intel_dsi.c | 2 +- + drivers/gpu/drm/i915/intel_dvo.c | 2 +- + drivers/gpu/drm/i915/intel_lvds.c | 3 +-- + drivers/gpu/drm/i915/intel_panel.c | 6 ----- + 6 files changed, 8 insertions(+), 45 deletions(-) + +diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c +index cd6e87756509a..492b0cb9bb2b2 100644 +--- a/drivers/gpu/drm/i915/intel_dp.c ++++ b/drivers/gpu/drm/i915/intel_dp.c +@@ -1674,23 +1674,6 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp, + return bpp; + } + +-static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1, +- struct drm_display_mode *m2) +-{ +- bool bres = false; +- +- if (m1 && m2) +- bres = (m1->hdisplay == m2->hdisplay && +- m1->hsync_start == m2->hsync_start && +- m1->hsync_end == m2->hsync_end && +- m1->htotal == m2->htotal && +- m1->vdisplay == m2->vdisplay && +- m1->vsync_start == m2->vsync_start && +- m1->vsync_end == m2->vsync_end && +- m1->vtotal == m2->vtotal); +- return bres; +-} +- + bool + intel_dp_compute_config(struct intel_encoder *encoder, + struct intel_crtc_state *pipe_config, +@@ -1737,16 +1720,8 @@ intel_dp_compute_config(struct intel_encoder *encoder, + pipe_config->has_audio = intel_conn_state->force_audio == HDMI_AUDIO_ON; + + if (intel_dp_is_edp(intel_dp) && intel_connector->panel.fixed_mode) { +- struct drm_display_mode *panel_mode = +- intel_connector->panel.alt_fixed_mode; +- struct drm_display_mode *req_mode = &pipe_config->base.mode; +- +- if (!intel_edp_compare_alt_mode(req_mode, panel_mode)) +- panel_mode = intel_connector->panel.fixed_mode; +- +- drm_mode_debug_printmodeline(panel_mode); +- +- intel_fixed_panel_mode(panel_mode, adjusted_mode); ++ intel_fixed_panel_mode(intel_connector->panel.fixed_mode, ++ adjusted_mode); + + if (INTEL_GEN(dev_priv) >= 9) { + int ret; +@@ -6123,7 +6098,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, + struct drm_i915_private *dev_priv = to_i915(dev); + struct drm_connector *connector = &intel_connector->base; + struct drm_display_mode *fixed_mode = NULL; +- struct drm_display_mode *alt_fixed_mode = NULL; + struct drm_display_mode *downclock_mode = NULL; + bool has_dpcd; + struct drm_display_mode *scan; +@@ -6178,14 +6152,13 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, + } + intel_connector->edid = edid; + +- /* prefer fixed mode from EDID if available, save an alt mode also */ ++ /* prefer fixed mode from EDID if available */ + list_for_each_entry(scan, &connector->probed_modes, head) { + if ((scan->type & DRM_MODE_TYPE_PREFERRED)) { + fixed_mode = drm_mode_duplicate(dev, scan); + downclock_mode = intel_dp_drrs_init( + intel_connector, fixed_mode); +- } else if (!alt_fixed_mode) { +- alt_fixed_mode = drm_mode_duplicate(dev, scan); ++ break; + } + } + +@@ -6222,8 +6195,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, + pipe_name(pipe)); + } + +- intel_panel_init(&intel_connector->panel, fixed_mode, alt_fixed_mode, +- downclock_mode); ++ intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode); + intel_connector->panel.backlight.power = intel_edp_backlight_power; + intel_panel_setup_backlight(connector, pipe); + +diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h +index 04d2774fe0ac5..bc0ee1015ea99 100644 +--- a/drivers/gpu/drm/i915/intel_drv.h ++++ b/drivers/gpu/drm/i915/intel_drv.h +@@ -269,7 +269,6 @@ struct intel_encoder { + + struct intel_panel { + struct drm_display_mode *fixed_mode; +- struct drm_display_mode *alt_fixed_mode; + struct drm_display_mode *downclock_mode; + + /* backlight */ +@@ -1819,7 +1818,6 @@ void intel_overlay_reset(struct drm_i915_private *dev_priv); + /* intel_panel.c */ + int intel_panel_init(struct intel_panel *panel, + struct drm_display_mode *fixed_mode, +- struct drm_display_mode *alt_fixed_mode, + struct drm_display_mode *downclock_mode); + void intel_panel_fini(struct intel_panel *panel); + void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode, +diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c +index 384b37e2da70e..f349b39201993 100644 +--- a/drivers/gpu/drm/i915/intel_dsi.c ++++ b/drivers/gpu/drm/i915/intel_dsi.c +@@ -1852,7 +1852,7 @@ void intel_dsi_init(struct drm_i915_private *dev_priv) + connector->display_info.width_mm = fixed_mode->width_mm; + connector->display_info.height_mm = fixed_mode->height_mm; + +- intel_panel_init(&intel_connector->panel, fixed_mode, NULL, NULL); ++ intel_panel_init(&intel_connector->panel, fixed_mode, NULL); + intel_panel_setup_backlight(connector, INVALID_PIPE); + + intel_dsi_add_properties(intel_connector); +diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c +index 6604806f89d5a..61d908e0df0e2 100644 +--- a/drivers/gpu/drm/i915/intel_dvo.c ++++ b/drivers/gpu/drm/i915/intel_dvo.c +@@ -542,7 +542,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv) + */ + intel_panel_init(&intel_connector->panel, + intel_dvo_get_current_mode(intel_encoder), +- NULL, NULL); ++ NULL); + intel_dvo->panel_wants_dither = true; + } + +diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c +index 34dd1e5233ace..48f618dc9abbb 100644 +--- a/drivers/gpu/drm/i915/intel_lvds.c ++++ b/drivers/gpu/drm/i915/intel_lvds.c +@@ -1180,8 +1180,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) + out: + mutex_unlock(&dev->mode_config.mutex); + +- intel_panel_init(&intel_connector->panel, fixed_mode, NULL, +- downclock_mode); ++ intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode); + intel_panel_setup_backlight(connector, INVALID_PIPE); + + lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder); +diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c +index 41d00b1603e30..b443278e569ce 100644 +--- a/drivers/gpu/drm/i915/intel_panel.c ++++ b/drivers/gpu/drm/i915/intel_panel.c +@@ -1928,13 +1928,11 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel) + + int intel_panel_init(struct intel_panel *panel, + struct drm_display_mode *fixed_mode, +- struct drm_display_mode *alt_fixed_mode, + struct drm_display_mode *downclock_mode) + { + intel_panel_init_backlight_funcs(panel); + + panel->fixed_mode = fixed_mode; +- panel->alt_fixed_mode = alt_fixed_mode; + panel->downclock_mode = downclock_mode; + + return 0; +@@ -1948,10 +1946,6 @@ void intel_panel_fini(struct intel_panel *panel) + if (panel->fixed_mode) + drm_mode_destroy(intel_connector->base.dev, panel->fixed_mode); + +- if (panel->alt_fixed_mode) +- drm_mode_destroy(intel_connector->base.dev, +- panel->alt_fixed_mode); +- + if (panel->downclock_mode) + drm_mode_destroy(intel_connector->base.dev, + panel->downclock_mode); + +From 7bb20c91fc051b79bcd774030b6c900c29e325d4 Mon Sep 17 00:00:00 2001 +From: Mika Westerberg <mika.westerberg@linux.intel.com> +Date: Tue, 22 May 2018 14:16:50 +0300 +Subject: [PATCH 3/5] ACPI / watchdog: Prefer iTCO_wdt always when WDAT table + uses RTC SRAM + +After we added quirk for Lenovo Z50-70 it turns out there are at least +two more systems where WDAT table includes instructions accessing RTC +SRAM. Instead of quirking each system separately, look for such +instructions in the table and automatically prefer iTCO_wdt if found. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=199033 +Reported-by: Arnold Guy <aurnoldg@gmail.com> +Reported-by: Alois Nespor <nespor@fssp.cz> +Reported-by: Yury Pakin <zxwarior@gmail.com> +Reported-by: Ihor Chyhin <ihorchyhin@ukr.net> +Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> +Acked-by: Guenter Roeck <linux@roeck-us.net> +--- + drivers/acpi/acpi_watchdog.c | 72 ++++++++++++++++++++++-------------- + 1 file changed, 45 insertions(+), 27 deletions(-) + +diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c +index 4bde16fb97d88..95600309ce420 100644 +--- a/drivers/acpi/acpi_watchdog.c ++++ b/drivers/acpi/acpi_watchdog.c +@@ -12,35 +12,51 @@ + #define pr_fmt(fmt) "ACPI: watchdog: " fmt + + #include <linux/acpi.h> +-#include <linux/dmi.h> + #include <linux/ioport.h> + #include <linux/platform_device.h> + + #include "internal.h" + +-static const struct dmi_system_id acpi_watchdog_skip[] = { +- { +- /* +- * On Lenovo Z50-70 there are two issues with the WDAT +- * table. First some of the instructions use RTC SRAM +- * to store persistent information. This does not work well +- * with Linux RTC driver. Second, more important thing is +- * that the instructions do not actually reset the system. +- * +- * On this particular system iTCO_wdt seems to work just +- * fine so we prefer that over WDAT for now. +- * +- * See also https://bugzilla.kernel.org/show_bug.cgi?id=199033. +- */ +- .ident = "Lenovo Z50-70", +- .matches = { +- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), +- DMI_MATCH(DMI_PRODUCT_NAME, "20354"), +- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Z50-70"), +- }, +- }, +- {} +-}; ++#ifdef CONFIG_RTC_MC146818_LIB ++#include <linux/mc146818rtc.h> ++ ++/* ++ * There are several systems where the WDAT table is accessing RTC SRAM to ++ * store persistent information. This does not work well with the Linux RTC ++ * driver so on those systems we skip WDAT driver and prefer iTCO_wdt ++ * instead. ++ * ++ * See also https://bugzilla.kernel.org/show_bug.cgi?id=199033. ++ */ ++static bool acpi_watchdog_uses_rtc(const struct acpi_table_wdat *wdat) ++{ ++ const struct acpi_wdat_entry *entries; ++ int i; ++ ++ entries = (struct acpi_wdat_entry *)(wdat + 1); ++ for (i = 0; i < wdat->entries; i++) { ++ const struct acpi_generic_address *gas; ++ ++ gas = &entries[i].register_region; ++ if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO) { ++ switch (gas->address) { ++ case RTC_PORT(0): ++ case RTC_PORT(1): ++ case RTC_PORT(2): ++ case RTC_PORT(3): ++ return true; ++ } ++ } ++ } ++ ++ return false; ++} ++#else ++static bool acpi_watchdog_uses_rtc(const struct acpi_table_wdat *wdat) ++{ ++ return false; ++} ++#endif + + static const struct acpi_table_wdat *acpi_watchdog_get_wdat(void) + { +@@ -50,9 +66,6 @@ static const struct acpi_table_wdat *acpi_watchdog_get_wdat(void) + if (acpi_disabled) + return NULL; + +- if (dmi_check_system(acpi_watchdog_skip)) +- return NULL; +- + status = acpi_get_table(ACPI_SIG_WDAT, 0, + (struct acpi_table_header **)&wdat); + if (ACPI_FAILURE(status)) { +@@ -60,6 +73,11 @@ static const struct acpi_table_wdat *acpi_watchdog_get_wdat(void) + return NULL; + } + ++ if (acpi_watchdog_uses_rtc(wdat)) { ++ pr_info("Skipping WDAT on this system because it uses RTC SRAM\n"); ++ return NULL; ++ } ++ + return wdat; + } + + +From 0edeffbcce2711999349fe02599d196fa922c5aa Mon Sep 17 00:00:00 2001 +From: Denis Kenzior <denkenz@gmail.com> +Date: Tue, 19 Jun 2018 10:39:50 -0500 +Subject: [PATCH 4/5] mac80211: disable BHs/preemption in + ieee80211_tx_control_port() + +On pre-emption enabled kernels the following print was being seen due to +missing local_bh_disable/local_bh_enable calls. mac80211 assumes that +pre-emption is disabled in the data path. + + BUG: using smp_processor_id() in preemptible [00000000] code: iwd/517 + caller is __ieee80211_subif_start_xmit+0x144/0x210 [mac80211] + [...] + Call Trace: + dump_stack+0x5c/0x80 + check_preemption_disabled.cold.0+0x46/0x51 + __ieee80211_subif_start_xmit+0x144/0x210 [mac80211] + +Fixes: 911806491425 ("mac80211: Add support for tx_control_port") +Signed-off-by: Denis Kenzior <denkenz@gmail.com> +[commit message rewrite, fixes tag] +Signed-off-by: Johannes Berg <johannes.berg@intel.com> +--- + net/mac80211/tx.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c +index 05a265cd573d4..7404a51145977 100644 +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -4800,7 +4800,9 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, + skb_reset_network_header(skb); + skb_reset_mac_header(skb); + ++ local_bh_disable(); + __ieee80211_subif_start_xmit(skb, skb->dev, flags); ++ local_bh_enable(); + + return 0; + } + +From d697907ebaadd66196d13f46ab948baec942b107 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Thu, 9 Aug 2018 13:54:03 +0200 +Subject: [PATCH 5/5] Arch Linux kernel v4.17.14-arch1 + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index ce4248f558d14..e3b36190778ac 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ + VERSION = 4 + PATCHLEVEL = 17 + SUBLEVEL = 11 +-EXTRAVERSION = ++EXTRAVERSION = -arch1 + NAME = Merciless Moray + + # *DOCUMENTATION* @@ -69,8 +69,9 @@ _localmodcfg= ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-ck -pkgver=4.17.11 -pkgrel=3 +_srcver=4.17.11-arch1 +pkgver=${_srcver%-*} +pkgrel=4 _ckpatchversion=1 arch=(x86_64) url="https://wiki.archlinux.org/index.php/Linux-ck" @@ -87,6 +88,7 @@ source=( linux.preset # standard config files for mkinitcpio ramdisk "enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz" # enable_additional_cpu_optimizations_for_gcc "http://ck.kolivas.org/patches/4.0/4.17/4.17-ck${_ckpatchversion}/${_ckpatchname}.xz" + 0001-ARCH_patches-20180809.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -94,12 +96,13 @@ validpgpkeys=( ) sha256sums=('db1e84ed4f213b43d50f3373627b2ffcdb3b65f3430f746a38f801554ef3728c' 'SKIP' - 'df83502cba84c1474b69274f26f6b5810332b75bf7a4b8ac99f00afde9ca5fb9' + '3453b5c4c7ce4b44f611050f95488e272119539f812dfde0667fe9c66402fd9b' '36e326d8a88b4087a3a0ee0d47643fc03baeda487659980d0e9d08791e4c729c' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d' - '6a0e9cce53da8c55161d01920cc02a09a3b70a60f1050ec91fafd9bb59cb6bb4') + '6a0e9cce53da8c55161d01920cc02a09a3b70a60f1050ec91fafd9bb59cb6bb4' + 'f1db9d4b6051e217969ab99d8ddedde4ca48c061d89fe535c04e6b4384506955') _kernelname=${pkgbase#linux} : ${_kernelname:=-ARCH} @@ -123,7 +126,7 @@ prepare() { msg2 "Setting config..." cp ../config .config - + ### Optionally disable NUMA if [ -n "$_NUMAdisable" ]; then msg2 "Disabling NUMA from kernel config..." @@ -201,7 +204,7 @@ _package() { #groups=('ck-generic') local kernver="$(<version)" - + cd linux-${pkgver} msg2 "Installing boot image..." @@ -334,21 +337,6 @@ _package-headers() { chmod -Rc u=rwX,go=rX "$pkgdir" } -_package-docs() { - pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel" - - local builddir="$pkgdir/usr/lib/modules/$(<version)/build" - - cd $_srcname - - msg2 "Installing documentation..." - mkdir -p "$builddir" - cp -t "$builddir" -a Documentation - - msg2 "Fixing permissions..." - chmod -Rc u=rwX,go=rX "$pkgdir" -} - pkgname=("$pkgbase" "$pkgbase-headers") for _p in "${pkgname[@]}"; do eval "package_$_p() { @@ -558,7 +558,12 @@ CONFIG_ARCH_HAS_MEM_ENCRYPT=y CONFIG_AMD_MEM_ENCRYPT=y # CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set CONFIG_ARCH_USE_MEMREMAP_PROT=y -# CONFIG_NUMA is not set +CONFIG_NUMA=y +CONFIG_AMD_NUMA=y +CONFIG_X86_64_ACPI_NUMA=y +CONFIG_NODES_SPAN_OTHER_NODES=y +# CONFIG_NUMA_EMU is not set +CONFIG_NODES_SHIFT=5 CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -568,6 +573,7 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_SELECT_MEMORY_MODEL=y CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y +CONFIG_NEED_MULTIPLE_NODES=y CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y @@ -686,6 +692,7 @@ CONFIG_HAVE_LIVEPATCH=y CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_USE_PERCPU_NUMA_NODE_ID=y # # Power management and ACPI options @@ -743,6 +750,7 @@ CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=y CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_NUMA=y CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_DEBUG=y |