kernel-small_fixes.patch

   1 --- linux-2.6.15.6/drivers/input/joystick/iforce/iforce-serio.c 2006-03-05 19:07:54.000000000 +0000
   2 +++ linux-2.6.15.6.iforce/drivers/input/joystick/iforce/iforce-serio.c  2006-04-29 23:17:59.000000000 +0000
   3 @@ -175,6 +175,12 @@
   4                 .id     = SERIO_ANY,
   5                 .extra  = SERIO_ANY,
   6         },
   7 +       {
   8 +               .type   = SERIO_RS232,
   9 +               .proto  = 0x1f, // Trust ForceFeedback Race Master
  10 +               .id     = SERIO_ANY,
  11 +               .extra  = SERIO_ANY,
  12 +       },
  13         { 0 }
  14  };
  15
  16 --- linux-2.6.27/arch/powerpc/include/asm/io.h~ 2006-06-18 01:49:35.000000000 +0000
  17 +++ linux-2.6.27/arch/powerpc/include/asm/io.h  2006-06-22 02:44:19.000000000 +0000
  18 @@ -445,6 +445,10 @@
  19  #define page_to_phys(page)     (page_to_pfn(page) << PAGE_SHIFT)
  20  #define page_to_bus(page)      (page_to_phys(page) + PCI_DRAM_OFFSET)
  21
  22 +#define isa_virt_to_bus virt_to_phys
  23 +#define isa_page_to_bus page_to_phys
  24 +#define isa_bus_to_virt phys_to_virt
  25 +
  26  /* Enforce in-order execution of data I/O.
  27   * No distinction between read/write on PPC; use eieio for all three.
  28   */
  29 --- linux-2.6.27/arch/powerpc/include/asm/suspend.h     2007-07-09 01:32:17.000000000 +0200
  30 +++ linux-2.6.27/arch/powerpc/include/asm/suspend.h     2007-08-28 23:26:16.629658848 +0200
  31 @@ -6,4 +6,7 @@
  32  void save_processor_state(void);
  33  void restore_processor_state(void);
  34
  35 +#define suspend2_faulted (0)
  36 +#define clear_suspend2_fault() do { } while(0)
  37 +
  38  #endif /* __ASM_POWERPC_SUSPEND_H */
  39 --- linux-2.6.26/arch/powerpc/kernel/swsusp.c   2008-09-29 00:01:56.000000000 +0200
  40 +++ linux-2.6.26/arch/powerpc/kernel/swsusp.c   2008-09-29 00:01:42.000000000 +0200
  41 @@ -9,6 +9,7 @@
  42   * 2 of the License, or (at your option) any later version.
  43   */
  44
  45 +#include <linux/module.h>
  46  #include <linux/sched.h>
  47  #include <asm/suspend.h>
  48  #include <asm/system.h>
  49 @@ -30,6 +31,7 @@
  50  #endif
  51
  52  }
  53 +EXPORT_SYMBOL(save_processor_state);
  54
  55  void restore_processor_state(void)
  56  {
  57
  58 --- linux-2.6.32/drivers/infiniband/Kconfig~    2009-12-05 00:26:03.663774916 +0100
  59 +++ linux-2.6.32/drivers/infiniband/Kconfig     2009-12-05 00:26:05.914179759 +0100
  60 @@ -37,7 +37,6 @@
  61  config INFINIBAND_ADDR_TRANS
  62         bool
  63         depends on INET
  64 -       depends on !(INFINIBAND = y && IPV6 = m)
  65         default y
  66
  67  source "drivers/infiniband/hw/mthca/Kconfig"
  68 --- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100
  69 +++ linux-2.6.33/scripts/mod/modpost.c  2010-03-07 14:26:47.242168558 +0100
  70 @@ -15,7 +15,8 @@
  71  #include <stdio.h>
  72  #include <ctype.h>
  73  #include "modpost.h"
  74 -#include "../../include/generated/autoconf.h"
  75 +// PLD architectures don't use CONFIG_SYMBOL_PREFIX
  76 +//#include "../../include/generated/autoconf.h"
  77  #include "../../include/linux/license.h"
  78
  79  /* Some toolchains use a `_' prefix for all user symbols. */
  80
  81 commit 87b09f1f25cd1e01d7c50bf423c7fe33027d7511
  82 Author: stephen hemminger <shemminger@vyatta.com>
  83 Date:   Fri Feb 12 06:58:00 2010 +0000
  84
  85     sky2: dont enable PME legacy mode
  86
  87     This bit is not changed by vendor driver, and should be left alone.
  88     The documentation implies this a debug bit.
  89       0 = WAKE# only asserted when VMAIN not available
  90       1 = WAKE# is depend on wake events and independent of VMAIN.
  91
  92     Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
  93     Signed-off-by: David S. Miller <davem@davemloft.net>
  94
  95 diff --git b/drivers/net/sky2.c a/drivers/net/sky2.c
  96 index 2494842..edf37aa 100644
  97 --- b/drivers/net/sky2.c
  98 +++ a/drivers/net/sky2.c
  99 @@ -733,6 +733,7 @@ static void sky2_wol_init(struct sky2_port *sky2)
 100         unsigned port = sky2->port;
 101         enum flow_control save_mode;
 102         u16 ctrl;
 103 +       u32 reg1;
 104
 105         /* Bring hardware out of reset */
 106         sky2_write16(hw, B0_CTST, CS_RST_CLR);
 107 @@ -786,6 +787,11 @@ static void sky2_wol_init(struct sky2_port *sky2)
 108         /* Disable PiG firmware */
 109         sky2_write16(hw, B0_CTST, Y2_HW_WOL_OFF);
 110
 111 +       /* Turn on legacy PCI-Express PME mode */
 112 +       reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
 113 +       reg1 |= PCI_Y2_PME_LEGACY;
 114 +       sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
 115 +
 116         /* block receiver */
 117         sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
 118  }
 119
 120 From: Gustavo F. Padovan <padovan@profusion.mobi>
 121 Date: Wed, 16 Mar 2011 18:36:29 +0000 (-0300)
 122 Subject: Bluetooth: Fix HCI_RESET command synchronization
 123 X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fpadovan%2Fbluetooth-next-2.6.git;a=commitdiff_plain;h=b99faf1b798d6d0e33526fd2cef55a405c08ff09;hp=58b6e124aac64bebb2e9e1a136cbd21a5ab0485a
 124
 125 Bluetooth: Fix HCI_RESET command synchronization
 126
 127 We can't send new commands before a cmd_complete for the HCI_RESET command
 128 shows up.
 129
 130 Reported-by: Mikko Vinni <mmvinni@yahoo.com>
 131 Reported-by: Justin P. Mattock <justinmattock@gmail.com>
 132 Reported-by: Ed Tomlinson <edt@aei.ca>
 133 Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
 134 Tested-by: Justin P. Mattock <justinmattock@gmail.com>
 135 Tested-by: Mikko Vinni <mmvinni@yahoo.com>
 136 Tested-by: Ed Tomlinson <edt@aei.ca>
 137 ---
 138
 139 diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
 140 index ec6acf2..2c0d309 100644
 141 --- a/include/net/bluetooth/hci.h
 142 +++ b/include/net/bluetooth/hci.h
 143 @@ -84,6 +84,8 @@ enum {
 144         HCI_SERVICE_CACHE,
 145         HCI_LINK_KEYS,
 146         HCI_DEBUG_KEYS,
 147 +
 148 +       HCI_RESET,
 149  };
 150
 151  /* HCI ioctl defines */
 152 diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
 153 index b372fb8..92b48e2 100644
 154 --- a/net/bluetooth/hci_core.c
 155 +++ b/net/bluetooth/hci_core.c
 156 @@ -186,6 +186,7 @@ static void hci_reset_req(struct hci_dev *hdev, unsigned long opt)
 157         BT_DBG("%s %ld", hdev->name, opt);
 158
 159         /* Reset device */
 160 +       set_bit(HCI_RESET, &hdev->flags);
 161         hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL);
 162  }
 163
 164 @@ -213,8 +214,10 @@ static void hci_init_req(struct hci_dev *hdev, unsigned long opt)
 165         /* Mandatory initialization */
 166
 167         /* Reset */
 168 -       if (!test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks))
 169 +       if (!test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks)) {
 170 +                       set_bit(HCI_RESET, &hdev->flags);
 171                         hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL);
 172 +       }
 173
 174         /* Read Local Supported Features */
 175         hci_send_cmd(hdev, HCI_OP_READ_LOCAL_FEATURES, 0, NULL);
 176 @@ -1074,6 +1077,7 @@ static void hci_cmd_timer(unsigned long arg)
 177
 178         BT_ERR("%s command tx timeout", hdev->name);
 179         atomic_set(&hdev->cmd_cnt, 1);
 180 +       clear_bit(HCI_RESET, &hdev->flags);
 181         tasklet_schedule(&hdev->cmd_task);
 182  }
 183
 184 diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
 185 index 3fbfa50..cebe7588 100644
 186 --- a/net/bluetooth/hci_event.c
 187 +++ b/net/bluetooth/hci_event.c
 188 @@ -183,6 +183,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
 189
 190         BT_DBG("%s status 0x%x", hdev->name, status);
 191
 192 +       clear_bit(HCI_RESET, &hdev->flags);
 193 +
 194         hci_req_complete(hdev, HCI_OP_RESET, status);
 195  }
 196
 197 @@ -1847,7 +1849,7 @@ static inline void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
 198         if (ev->opcode != HCI_OP_NOP)
 199                 del_timer(&hdev->cmd_timer);
 200
 201 -       if (ev->ncmd) {
 202 +       if (ev->ncmd && !test_bit(HCI_RESET, &hdev->flags)) {
 203                 atomic_set(&hdev->cmd_cnt, 1);
 204                 if (!skb_queue_empty(&hdev->cmd_q))
 205                         tasklet_schedule(&hdev->cmd_task);