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
9 + .proto = 0x1f, // Trust ForceFeedback Race Master
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
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)
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
26 /* Enforce in-order execution of data I/O.
27 * No distinction between read/write on PPC; use eieio for all three.
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
32 void save_processor_state(void);
33 void restore_processor_state(void);
35 +#define suspend2_faulted (0)
36 +#define clear_suspend2_fault() do { } while(0)
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
42 * 2 of the License, or (at your option) any later version.
45 +#include <linux/module.h>
46 #include <linux/sched.h>
47 #include <asm/suspend.h>
48 #include <asm/system.h>
53 +EXPORT_SYMBOL(save_processor_state);
55 void restore_processor_state(void)
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
61 config INFINIBAND_ADDR_TRANS
64 - depends on !(INFINIBAND = y && IPV6 = m)
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
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"
79 /* Some toolchains use a `_' prefix for all user symbols. */
81 commit 87b09f1f25cd1e01d7c50bf423c7fe33027d7511
82 Author: stephen hemminger <shemminger@vyatta.com>
83 Date: Fri Feb 12 06:58:00 2010 +0000
85 sky2: dont enable PME legacy mode
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.
92 Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
93 Signed-off-by: David S. Miller <davem@davemloft.net>
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;
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);
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);
117 sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
119 Subject: [PATCH -mm] swiotlb: fix wrong panic
120 From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
122 swiotlb's map_page wrongly calls panic() when it can't find a buffer
123 fit for device's dma mask. It should return an error instead.
125 Devices with an odd dma mask (i.e. under 4G) like b44 network card hit
126 this bug (the system crashes):
128 http://marc.info/?l=linux-kernel&m=129648943830106&w=2
130 If swiotlb returns an error, b44 driver can use the own bouncing
133 Reported-by: Chuck Ebbert <cebbert@redhat.com>
134 Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
135 Tested-by: Arkadiusz Miskiewicz <arekm@maven.pl>
136 Cc: stable@kernel.org
138 lib/swiotlb.c | 6 ++++--
139 1 files changed, 4 insertions(+), 2 deletions(-)
141 diff --git a/lib/swiotlb.c b/lib/swiotlb.c
142 index c47bbe1..93ca08b 100644
145 @@ -686,8 +686,10 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
147 * Ensure that the address returned is DMA'ble
149 - if (!dma_capable(dev, dev_addr, size))
150 - panic("map_single: bounce buffer is not DMA'ble");
151 + if (!dma_capable(dev, dev_addr, size)) {
152 + swiotlb_tbl_unmap_single(dev, map, size, dir);
153 + dev_addr = swiotlb_virt_to_bus(dev, io_tlb_overflow_buffer);