]> git.pld-linux.org Git - packages/kernel.git/blobdiff - kernel-small_fixes.patch
- up to 5.8.0; builds without aufs
[packages/kernel.git] / kernel-small_fixes.patch
index 0644bf6fdc1650925a982e76d13cc28a2daf95c5..f0584fb5d2bf489cc24ac7eaf952c345766e3c27 100644 (file)
---- linux-2.6.15.6/drivers/input/joystick/iforce/iforce-serio.c        2006-03-05 19:07:54.000000000 +0000
-+++ linux-2.6.15.6.iforce/drivers/input/joystick/iforce/iforce-serio.c 2006-04-29 23:17:59.000000000 +0000
-@@ -175,6 +175,12 @@
-               .id     = SERIO_ANY,
-               .extra  = SERIO_ANY,
-       },
-+      {
-+              .type   = SERIO_RS232,
-+              .proto  = 0x1f, // Trust ForceFeedback Race Master
-+              .id     = SERIO_ANY,
-+              .extra  = SERIO_ANY,
-+      },
-       { 0 }
- };
---- linux-2.6.27/arch/powerpc/include/asm/io.h~        2006-06-18 01:49:35.000000000 +0000
-+++ linux-2.6.27/arch/powerpc/include/asm/io.h 2006-06-22 02:44:19.000000000 +0000
-@@ -445,6 +445,10 @@
- #define page_to_phys(page)    (page_to_pfn(page) << PAGE_SHIFT)
- #define page_to_bus(page)     (page_to_phys(page) + PCI_DRAM_OFFSET)
-+#define isa_virt_to_bus virt_to_phys
-+#define isa_page_to_bus page_to_phys
-+#define isa_bus_to_virt phys_to_virt
-+
- /* Enforce in-order execution of data I/O.
-  * No distinction between read/write on PPC; use eieio for all three.
-  */
---- linux-2.6.20/drivers/media/common/ir-keymaps.c.orig        2007-02-04 19:44:54.000000000 +0100
-+++ linux-2.6.20/drivers/media/common/ir-keymaps.c     2007-02-17 22:22:39.327414970 +0100
-@@ -151,10 +151,6 @@
- IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE] = {
--      [ 0x1e ] = KEY_POWER,       // power
--      [ 0x07 ] = KEY_MEDIA,       // source
--      [ 0x1c ] = KEY_SEARCH,      // scan
+; https://lkml.org/lkml/2019/7/10/244
+diff -ur linux-5.3/drivers/scsi/aacraid.org/aacraid.h linux-5.3/drivers/scsi/aacraid/aacraid.h
+--- linux-5.3/drivers/scsi/aacraid.org/aacraid.h       2019-11-01 22:42:37.011469816 +0100
++++ linux-5.3/drivers/scsi/aacraid/aacraid.h   2019-11-04 09:29:51.321486211 +0100
+@@ -2740,17 +2740,6 @@
+ int aac_rx_deliver_producer(struct fib * fib);
+ void aac_reinit_aif(struct aac_dev *aac, unsigned int index);
+-static inline int aac_is_src(struct aac_dev *dev)
+-{
+-      u16 device = dev->pdev->device;
 -
- /* FIXME: duplicate keycodes?
-  *
-  * These four keys seem to share the same GPIO as CH+, CH-, <<< and >>>
-@@ -175,14 +171,10 @@
-  */
-       [ 0x03 ] = KEY_TUNER,       // TV/FM
-+      [ 0x07 ] = KEY_SEARCH,      // scan
-+      [ 0x1c ] = KEY_ZOOM,        // zoom
--      [ 0x00 ] = KEY_RECORD,
--      [ 0x08 ] = KEY_STOP,
--      [ 0x11 ] = KEY_PLAY,
+-      if (device == PMC_DEVICE_S6 ||
+-              device == PMC_DEVICE_S7 ||
+-              device == PMC_DEVICE_S8)
+-              return 1;
+-      return 0;
+-}
 -
--      [ 0x1a ] = KEY_PLAYPAUSE,   // freeze
--      [ 0x19 ] = KEY_ZOOM,        // zoom
--      [ 0x0f ] = KEY_TEXT,        // min
-+      [ 0x1e ] = KEY_POWER,       // power
-       [ 0x01 ] = KEY_1,
-       [ 0x0b ] = KEY_2,
-@@ -195,20 +187,22 @@
-       [ 0x12 ] = KEY_9,
-       [ 0x02 ] = KEY_0,
-       [ 0x10 ] = KEY_LAST,        // +100
--      [ 0x13 ] = KEY_LIST,        // recall
-+      [ 0x13 ] = KEY_LIST,        // loop
--      [ 0x1f ] = KEY_CHANNELUP,   // chn down
--      [ 0x17 ] = KEY_CHANNELDOWN, // chn up
--      [ 0x16 ] = KEY_VOLUMEUP,    // vol down
--      [ 0x14 ] = KEY_VOLUMEDOWN,  // vol up
-+      [ 0x1f ] = KEY_VOLUMEUP,    // vol down
-+      [ 0x17 ] = KEY_VOLUMEDOWN,  // vol up
-+      [ 0x16 ] = KEY_CHANNELUP,   // chn down
-+      [ 0x14 ] = KEY_CHANNELDOWN, // chn up
--      [ 0x04 ] = KEY_KPMINUS,     // <<<
-+      [ 0x00 ] = KEY_MEDIA,       // source
-+      [ 0x18 ] = KEY_MUTE,        // mute/unmute
-+
-+      [ 0x04 ] = KEY_KPMINUS,     // -
-       [ 0x0e ] = KEY_SETUP,       // function
--      [ 0x0c ] = KEY_KPPLUS,      // >>>
-+      [ 0x0c ] = KEY_KPPLUS,      // +
--      [ 0x0d ] = KEY_GOTO,        // mts
--      [ 0x1d ] = KEY_REFRESH,     // reset
--      [ 0x18 ] = KEY_MUTE         // mute/unmute
-+      [ 0x0d ] = KEY_REFRESH,     // reset
-+      [ 0x0f ] = KEY_PLAYPAUSE    // freeze
- };
- EXPORT_SYMBOL_GPL(ir_codes_pixelview);
---- linux-2.6.27/arch/powerpc/include/asm/suspend.h    2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.27/arch/powerpc/include/asm/suspend.h    2007-08-28 23:26:16.629658848 +0200
-@@ -6,4 +6,7 @@
- void save_processor_state(void);
- void restore_processor_state(void);
-+#define suspend2_faulted (0)
-+#define clear_suspend2_fault() do { } while(0)
-+
- #endif /* __ASM_POWERPC_SUSPEND_H */
---- linux-2.6.26/arch/powerpc/kernel/swsusp.c  2008-09-29 00:01:56.000000000 +0200
-+++ linux-2.6.26/arch/powerpc/kernel/swsusp.c  2008-09-29 00:01:42.000000000 +0200
-@@ -9,6 +9,7 @@
-  * 2 of the License, or (at your option) any later version.
-  */
-+#include <linux/module.h>
- #include <linux/sched.h>
- #include <asm/suspend.h>
- #include <asm/system.h>
-@@ -30,6 +31,7 @@
- #endif
+ static inline int aac_supports_2T(struct aac_dev *dev)
+ {
+       return (dev->adapter_info.options & AAC_OPT_NEW_COMM_64);
+diff -ur linux-5.3/drivers/scsi/aacraid.org/comminit.c linux-5.3/drivers/scsi/aacraid/comminit.c
+--- linux-5.3/drivers/scsi/aacraid.org/comminit.c      2019-11-01 22:42:37.014803249 +0100
++++ linux-5.3/drivers/scsi/aacraid/comminit.c  2019-11-04 09:29:51.321486211 +0100
+@@ -41,8 +41,11 @@
+ {
+       u32 status = 0;
+-      if (aac_is_src(dev))
++      if (dev->pdev->device == PMC_DEVICE_S6 ||
++              dev->pdev->device == PMC_DEVICE_S7 ||
++              dev->pdev->device == PMC_DEVICE_S8) {
+               status = src_readl(dev, MUnit.OMR);
++      }
+       return (status & AAC_INT_MODE_MSIX);
  }
-+EXPORT_SYMBOL(save_processor_state);
  
- void restore_processor_state(void)
+@@ -349,7 +352,8 @@
+       /* FIB should be freed only after getting the response from the F/W */
+       if (status != -ERESTARTSYS)
+               aac_fib_free(fibctx);
+-      if (aac_is_src(dev) &&
++      if ((dev->pdev->device == PMC_DEVICE_S7 ||
++           dev->pdev->device == PMC_DEVICE_S8) &&
+            dev->msi_enabled)
+               aac_set_intx_mode(dev);
+       return status;
+@@ -610,7 +614,8 @@
+               dev->max_fib_size = status[1] & 0xFFE0;
+               host->sg_tablesize = status[2] >> 16;
+               dev->sg_tablesize = status[2] & 0xFFFF;
+-              if (aac_is_src(dev)) {
++              if (dev->pdev->device == PMC_DEVICE_S7 ||
++                  dev->pdev->device == PMC_DEVICE_S8) {
+                       if (host->can_queue > (status[3] >> 16) -
+                                       AAC_NUM_MGT_FIB)
+                               host->can_queue = (status[3] >> 16) -
+@@ -629,7 +634,9 @@
+                       pr_warn("numacb=%d ignored\n", numacb);
+       }
+-      if (aac_is_src(dev))
++      if (dev->pdev->device == PMC_DEVICE_S6 ||
++          dev->pdev->device == PMC_DEVICE_S7 ||
++          dev->pdev->device == PMC_DEVICE_S8)
+               aac_define_int_mode(dev);
+       /*
+        *      Ok now init the communication subsystem
+diff -ur linux-5.3/drivers/scsi/aacraid.org/commsup.c linux-5.3/drivers/scsi/aacraid/commsup.c
+--- linux-5.3/drivers/scsi/aacraid.org/commsup.c       2019-11-01 22:42:37.014803249 +0100
++++ linux-5.3/drivers/scsi/aacraid/commsup.c   2019-11-04 09:29:51.321486211 +0100
+@@ -2593,7 +2593,9 @@
  {
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -2588,18 +2588,15 @@ static int process_backlog(struct napi_s
-               local_irq_disable();
-               skb = __skb_dequeue(&queue->input_pkt_queue);
-               if (!skb) {
-+                      __napi_complete(napi);
-                       local_irq_enable();
--                      napi_complete(napi);
--                      goto out;
-+                      break;
-               }
-               local_irq_enable();
--              napi_gro_receive(napi, skb);
-+              netif_receive_skb(skb);
-       } while (++work < quota && jiffies == start_time);
--      napi_gro_flush(napi);
+       int i;
+-      if (aac_is_src(dev)) {
++      if (dev->pdev->device == PMC_DEVICE_S6 ||
++          dev->pdev->device == PMC_DEVICE_S7 ||
++          dev->pdev->device == PMC_DEVICE_S8) {
+               if (dev->max_msix > 1) {
+                       for (i = 0; i < dev->max_msix; i++)
+                               free_irq(pci_irq_vector(dev->pdev, i),
+diff -ur linux-5.3/drivers/scsi/aacraid.org/linit.c linux-5.3/drivers/scsi/aacraid/linit.c
+--- linux-5.3/drivers/scsi/aacraid.org/linit.c 2019-11-01 22:42:37.011469816 +0100
++++ linux-5.3/drivers/scsi/aacraid/linit.c     2019-11-04 09:29:51.321486211 +0100
+@@ -1567,8 +1567,9 @@
+       aac_send_shutdown(aac);
+       aac_adapter_disable_int(aac);
 -
--out:
-       return work;
- }
+-      if (aac_is_src(aac)) {
++      if (aac->pdev->device == PMC_DEVICE_S6 ||
++          aac->pdev->device == PMC_DEVICE_S7 ||
++          aac->pdev->device == PMC_DEVICE_S8) {
+               if (aac->max_msix > 1) {
+                       for (i = 0; i < aac->max_msix; i++) {
+                               free_irq(pci_irq_vector(aac->pdev, i),
+@@ -1858,7 +1859,8 @@
+       aac_adapter_enable_int(dev);
+-      if (aac_is_src(dev))
++      if (dev->pdev->device == PMC_DEVICE_S7 ||
++          dev->pdev->device == PMC_DEVICE_S8)
+               aac_define_int_mode(dev);
+       if (dev->msi_enabled)
+
+--- linux-5.7/scripts/ld-version.sh~   2020-06-01 01:49:15.000000000 +0200
++++ linux-5.7/scripts/ld-version.sh    2020-06-02 08:28:48.303207264 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/awk -f
++#!/bin/awk -f
+ # SPDX-License-Identifier: GPL-2.0
+ # extract linker version number from stdin and turn into single number
+       {
This page took 0.067204 seconds and 4 git commands to generate.