projects / packages / kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| e93d65aa PG |
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 | ||
| 2380c486 JR |
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 | |
| e93d65aa PG |
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 | */ | |
| 2380c486 JR |
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 | */ | |
| e93d65aa | 44 | |
| 2380c486 JR |
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 | |
| e93d65aa | 51 | |
| 2380c486 JR |
52 | } |
| 53 | +EXPORT_SYMBOL(save_processor_state); | |
| e93d65aa | 54 | |
| 2380c486 JR |
55 | void restore_processor_state(void) |
| 56 | { | |
| 7e46296a | 57 | |
| b99b459f | 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" | |
| af6ac010 AM |
68 | From a17e18790a8c47113a73139d54a375dc9ccd8f08 Mon Sep 17 00:00:00 2001 |
| 69 | From: Michael Neuling <mikey@neuling.org> | |
| 70 | Date: Mon, 22 Feb 2010 12:44:24 -0800 | |
| 71 | Subject: [PATCH] fs/exec.c: fix initial stack reservation | |
| 72 | ||
| 73 | 803bf5ec259941936262d10ecc84511b76a20921 ("fs/exec.c: restrict initial | |
| 74 | stack space expansion to rlimit") attempts to limit the initial stack to | |
| 75 | 20*PAGE_SIZE. Unfortunately, in attempting ensure the stack is not | |
| 76 | reduced in size, we ended up not changing the stack at all. | |
| 77 | ||
| 78 | This size reduction check is not necessary as the expand_stack call does | |
| 79 | this already. | |
| 80 | ||
| 81 | This caused a regression in UML resulting in most guest processes being | |
| 82 | killed. | |
| 83 | ||
| 84 | Signed-off-by: Michael Neuling <mikey@neuling.org> | |
| 85 | Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> | |
| 86 | Acked-by: WANG Cong <xiyou.wangcong@gmail.com> | |
| 87 | Cc: Anton Blanchard <anton@samba.org> | |
| 88 | Cc: Oleg Nesterov <oleg@redhat.com> | |
| 89 | Cc: James Morris <jmorris@namei.org> | |
| 90 | Cc: Serge Hallyn <serue@us.ibm.com> | |
| 91 | Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> | |
| 92 | Cc: Jouni Malinen <j@w1.fi> | |
| 93 | Cc: <stable@kernel.org> | |
| 94 | Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |
| 95 | Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | |
| 96 | --- | |
| 97 | fs/exec.c | 1 - | |
| 98 | 1 files changed, 0 insertions(+), 1 deletions(-) | |
| 99 | ||
| af6ac010 AM |
100 | -- |
| 101 | 1.7.0.1 | |
| 102 |