-diff -Nur linux-2.6.15.6/drivers/input/joystick/iforce/iforce-serio.c linux-2.6.15.6.iforce/drivers/input/joystick/iforce/iforce-serio.c
--- 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 @@
{ 0 }
};
---- linux-2.6.17/include/linux/skbuff.h~ 2006-06-19 16:14:43.000000000 +0200
-+++ linux-2.6.17/include/linux/skbuff.h 2006-06-19 16:57:47.000000000 +0200
-@@ -19,6 +19,7 @@
- #include <linux/compiler.h>
- #include <linux/time.h>
- #include <linux/cache.h>
-+#include <linux/ip.h>
-
- #include <asm/atomic.h>
- #include <asm/types.h>
---- linux-2.6.17/include/asm-ppc/io.h~ 2006-06-18 01:49:35.000000000 +0000
-+++ linux-2.6.17/include/asm-ppc/io.h 2006-06-22 02:44:19.000000000 +0000
+--- 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)
/* Enforce in-order execution of data I/O.
* No distinction between read/write on PPC; use eieio for all three.
*/
---- linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c 2006-07-25 14:53:19.000000000 +0100
-+++ linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c 2006-07-25 15:25:32.000000000 +0100
-@@ -58,6 +58,7 @@
- struct tasklet_struct ciintf_irq_tasklet;
- int slot_status;
- struct dvb_ca_en50221 ca;
-+ u8 reinitialise_demod:1;
- };
+--- 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.
+ */
- /* GPIO Connections:
-@@ -214,8 +215,9 @@
- while (--timeout > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
- msleep(100);
++#include <linux/module.h>
+ #include <linux/sched.h>
+ #include <asm/suspend.h>
+ #include <asm/system.h>
+@@ -30,6 +31,7 @@
+ #endif
-- /* reinitialise the frontend */
-- dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
-+ /* reinitialise the frontend if necessary */
-+ if (budget_av->reinitialise_demod)
-+ dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
+ }
++EXPORT_SYMBOL(save_processor_state);
- if (timeout <= 0)
- {
-@@ -1064,12 +1066,10 @@
- fe = tda10021_attach(&philips_cu1216_config,
- &budget_av->budget.i2c_adap,
- read_pwm(budget_av));
-- if (fe) {
-- fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;
-- }
- break;
+ void restore_processor_state(void)
+ {
+
+--- linux-2.6.32/drivers/infiniband/Kconfig~ 2009-12-05 00:26:03.663774916 +0100
++++ linux-2.6.32/drivers/infiniband/Kconfig 2009-12-05 00:26:05.914179759 +0100
+@@ -37,7 +37,6 @@
+ config INFINIBAND_ADDR_TRANS
+ bool
+ depends on INET
+- depends on !(INFINIBAND = y && IPV6 = m)
+ default y
- case SUBID_DVBC_KNC1_PLUS:
-+ budget_av->reinitialise_demod = 1;
- fe = tda10021_attach(&philips_cu1216_config,
- &budget_av->budget.i2c_adap,
- read_pwm(budget_av));
+ source "drivers/infiniband/hw/mthca/Kconfig"
+From a17e18790a8c47113a73139d54a375dc9ccd8f08 Mon Sep 17 00:00:00 2001
+From: Michael Neuling <mikey@neuling.org>
+Date: Mon, 22 Feb 2010 12:44:24 -0800
+Subject: [PATCH] fs/exec.c: fix initial stack reservation
+
+803bf5ec259941936262d10ecc84511b76a20921 ("fs/exec.c: restrict initial
+stack space expansion to rlimit") attempts to limit the initial stack to
+20*PAGE_SIZE. Unfortunately, in attempting ensure the stack is not
+reduced in size, we ended up not changing the stack at all.
+
+This size reduction check is not necessary as the expand_stack call does
+this already.
+
+This caused a regression in UML resulting in most guest processes being
+killed.
+
+Signed-off-by: Michael Neuling <mikey@neuling.org>
+Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
+Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
+Cc: Anton Blanchard <anton@samba.org>
+Cc: Oleg Nesterov <oleg@redhat.com>
+Cc: James Morris <jmorris@namei.org>
+Cc: Serge Hallyn <serue@us.ibm.com>
+Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Cc: Jouni Malinen <j@w1.fi>
+Cc: <stable@kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ fs/exec.c | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+--
+1.7.0.1
+
+"fix" for:
+ERROR: "__bad_udelay" [drivers/net/tokenring/tms380tr.ko] undefined!
+
+--- linux-2.6.32.63/drivers/net/tokenring/tms380tr.c~ 2014-11-10 10:39:22.000000000 +0200
++++ linux-2.6.32.63/drivers/net/tokenring/tms380tr.c 2014-11-11 00:50:08.576155738 +0200
+@@ -1240,7 +1240,7 @@
+ */
+ void tms380tr_wait(unsigned long time)
+ {
+-#if 0
++#if 1
+ long tmp;
+
+ tmp = jiffies + time/(1000000/HZ);
projects / packages / kernel.git / blobdiff