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);
122 blk_cleanup_queue() calls elevator_exit() and after this, we can't
123 touch the elevator without oopsing. __elv_next_request() must check
124 for this state because in the refcounted queue model, we can still
125 call it after blk_cleanup_queue() has been called.
127 This was reported as causing an oops attributable to scsi.
129 Signed-off-by: James Bottomley <James.Bottomley@suse.de>
132 1 files changed, 2 insertions(+), 1 deletions(-)
134 diff --git a/block/blk.h b/block/blk.h
135 index 6126346..4df474d 100644
138 @@ -62,7 +62,8 @@ static inline struct request *__elv_next_request(struct request_queue *q)
142 - if (!q->elevator->ops->elevator_dispatch_fn(q, 0))
143 + if (test_bit(QUEUE_FLAG_DEAD, &q->queue_flags) ||
144 + !q->elevator->ops->elevator_dispatch_fn(q, 0))
154 To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
155 the body of a message to majordomo@vger.kernel.org
156 More majordomo info at http://vger.kernel.org/majordomo-info.htmlcommit a5b2c5b2ad5853591a6cac6134cd0f599a720865
157 Author: Kees Cook <kees.cook@canonical.com>
158 Date: Tue May 31 11:31:41 2011 -0700
160 AppArmor: fix oops in apparmor_setprocattr
162 When invalid parameters are passed to apparmor_setprocattr a NULL deref
163 oops occurs when it tries to record an audit message. This is because
164 it is passing NULL for the profile parameter for aa_audit. But aa_audit
165 now requires that the profile passed is not NULL.
167 Fix this by passing the current profile on the task that is trying to
170 Signed-off-by: Kees Cook <kees@ubuntu.com>
171 Signed-off-by: John Johansen <john.johansen@canonical.com>
172 Cc: stable@kernel.org
173 Signed-off-by: James Morris <jmorris@namei.org>
175 diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
176 index ae3a698..ec1bcec 100644
177 --- a/security/apparmor/lsm.c
178 +++ b/security/apparmor/lsm.c
179 @@ -593,7 +593,8 @@ static int apparmor_setprocattr(struct task_struct *task, char *name,
180 sa.aad.op = OP_SETPROCATTR;
182 sa.aad.error = -EINVAL;
183 - return aa_audit(AUDIT_APPARMOR_DENIED, NULL, GFP_KERNEL,
184 + return aa_audit(AUDIT_APPARMOR_DENIED,
185 + __aa_current_profile(), GFP_KERNEL,
188 } else if (strcmp(name, "exec") == 0) {