Author: pluto Date: Fri Sep 30 21:52:40 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated for 2.6.14.
---- Files affected:
SOURCES:
2.6.0-t9-acpi_osl-lkml.patch (1.1.2.1 -> 1.1.2.2) , 2.6.7-ppc-asm-defs.patch
(1.1.2.5 -> 1.1.2.6) , kernel-MAX_INIT_ARGS.patch (1.1.2.8 -> 1.1.2.9) ,
linux-2.6-extended-utf8.patch (1.1.2.1 -> 1.1.2.2) , linux-2.6.13-imq2.diff
(1.1.2.4 -> 1.1.2.5)
---- Diffs:
================================================================
Index: SOURCES/2.6.0-t9-acpi_osl-lkml.patch
diff -u SOURCES/2.6.0-t9-acpi_osl-lkml.patch:1.1.2.1
SOURCES/2.6.0-t9-acpi_osl-lkml.patch:1.1.2.2
--- SOURCES/2.6.0-t9-acpi_osl-lkml.patch:1.1.2.1 Fri Nov 19 15:57:54 2004
+++ SOURCES/2.6.0-t9-acpi_osl-lkml.patch Fri Sep 30 23:52:35 2005
@@ -1,25 +1,26 @@
---- linux-2.6.10-rc2/drivers/acpi/osl.c.orig 2004-11-15 02:28:18.000000000
+0100
-+++ linux-2.6.10-rc2/drivers/acpi/osl.c 2004-11-19 15:53:57.437348968
+0100
-@@ -40,6 +40,7 @@
- #include <asm/io.h>
+--- a/drivers/acpi/osl.c.orig 2005-09-20 03:00:41.000000000 +0000
++++ b/drivers/acpi/osl.c 2005-09-30 21:28:29.241229960 +0000
+@@ -42,6 +42,7 @@
#include <acpi/acpi_bus.h>
+ #include <acpi/processor.h>
#include <asm/uaccess.h>
+#include <asm/hardirq.h>
#include <linux/efi.h>
-@@ -308,8 +309,12 @@
- void
- acpi_os_sleep(acpi_integer ms)
+@@ -313,8 +314,13 @@
+
+ void acpi_os_sleep(acpi_integer ms)
{
- current->state = TASK_INTERRUPTIBLE;
-- schedule_timeout(((signed long) ms * HZ) / 1000);
+- schedule_timeout(((signed long)ms * HZ) / 1000);
+ if (!in_atomic()) {
+ current->state = TASK_INTERRUPTIBLE;
+ schedule_timeout(((long)ms * HZ) / 1000);
+ } else {
+ acpi_os_stall((long)ms * 1000);
+ }
++
}
- void
+ EXPORT_SYMBOL(acpi_os_sleep);
================================================================
Index: SOURCES/2.6.7-ppc-asm-defs.patch
diff -u SOURCES/2.6.7-ppc-asm-defs.patch:1.1.2.5
SOURCES/2.6.7-ppc-asm-defs.patch:1.1.2.6
--- SOURCES/2.6.7-ppc-asm-defs.patch:1.1.2.5 Sun Aug 8 12:28:48 2004
+++ SOURCES/2.6.7-ppc-asm-defs.patch Fri Sep 30 23:52:35 2005
@@ -1,11 +1,11 @@
--- linux-2.6.7/arch/ppc/Makefile.orig 2004-07-06 22:03:51.000000000 +0200
+++ linux-2.6.7/arch/ppc/Makefile 2004-07-07 09:18:14.405325304 +0200
-@@ -22,7 +22,7 @@
-
+@@ -23,7 +23,7 @@
LDFLAGS_vmlinux := -Ttext $(KERNELLOAD) -Bstatic
- CPPFLAGS += -Iarch/$(ARCH)
+ # The -Iarch/$(ARCH)/include is temporary while we are merging
+ CPPFLAGS += -Iarch/$(ARCH) -Iarch/$(ARCH)/include
-AFLAGS += -Iarch/$(ARCH)
+AFLAGS += -Iarch/$(ARCH) -Wa,-many
CFLAGS += -Iarch/$(ARCH) -msoft-float -pipe \
- -ffixed-r2 -Wno-uninitialized -mmultiple
+ -ffixed-r2 -mmultiple
CPP = $(CC) -E $(CFLAGS)
================================================================
Index: SOURCES/kernel-MAX_INIT_ARGS.patch
diff -u SOURCES/kernel-MAX_INIT_ARGS.patch:1.1.2.8
SOURCES/kernel-MAX_INIT_ARGS.patch:1.1.2.9
--- SOURCES/kernel-MAX_INIT_ARGS.patch:1.1.2.8 Mon Jun 20 09:44:46 2005
+++ SOURCES/kernel-MAX_INIT_ARGS.patch Fri Sep 30 23:52:35 2005
@@ -8,7 +8,6 @@
+#define COMMAND_LINE_SIZE 4096
#endif
-diff -Nur --exclude '*.orig' linux-2.6.7-rc3.org/include/asm-i386/setup.h
linux-2.6.7-rc3/include/asm-i386/setup.h
--- linux-2.6.7-rc3.org/include/asm-i386/setup.h 2004-06-07
21:14:42.000000000 +0200
+++ linux-2.6.7-rc3/include/asm-i386/setup.h 2004-06-08 11:29:19.000000000
+0200
@@ -17,7 +17,7 @@
@@ -20,7 +19,6 @@
#define OLD_CL_MAGIC_ADDR 0x90020
#define OLD_CL_MAGIC 0xA33F
-diff -Nur --exclude '*.orig' linux-2.6.7-rc3.org/include/asm-s390/setup.h
linux-2.6.7-rc3/include/asm-s390/setup.h
--- linux-2.6.7-rc3.org/include/asm-s390/setup.h 2004-06-07
21:14:58.000000000 +0200
+++ linux-2.6.7-rc3/include/asm-s390/setup.h 2004-06-08 11:30:38.000000000
+0200
@@ -9,7 +9,7 @@
@@ -32,17 +30,6 @@
#define RAMDISK_ORIGIN 0x800000
#define RAMDISK_SIZE 0x800000
---- linux-2.6.7/include/asm-ppc/setup.h.orig 2004-07-06 17:53:17.000000000
+0200
-+++ linux-2.6.7/include/asm-ppc/setup.h 2004-07-06 17:55:37.428864888
+0200
-@@ -8,7 +8,7 @@
- #include <asm-m68k/setup.h>
- /* We have a bigger command line buffer. */
- #undef COMMAND_LINE_SIZE
--#define COMMAND_LINE_SIZE 512
-+#define COMMAND_LINE_SIZE 4096
-
- #endif /* _PPC_SETUP_H */
- #endif /* __KERNEL__ */
--- linux-2.6.7/arch/ppc/syslib/prom.c.orig 2004-07-06 17:53:30.000000000
+0200
+++ linux-2.6.7/arch/ppc/syslib/prom.c 2004-07-06 17:55:57.781770776 +0200
@@ -85,7 +85,7 @@
================================================================
Index: SOURCES/linux-2.6-extended-utf8.patch
diff -u SOURCES/linux-2.6-extended-utf8.patch:1.1.2.1
SOURCES/linux-2.6-extended-utf8.patch:1.1.2.2
--- SOURCES/linux-2.6-extended-utf8.patch:1.1.2.1 Mon Sep 19 03:10:13 2005
+++ SOURCES/linux-2.6-extended-utf8.patch Fri Sep 30 23:52:35 2005
@@ -4,7 +4,7 @@
--- a/drivers/char/keyboard.c 2005-09-19 02:26:04.000000000 +0200
+++ b/drivers/char/keyboard.c 2005-09-19 03:08:39.000000000 +0200
-@@ -330,10 +330,9 @@
+@@ -329,10 +329,9 @@
* Many other routines do put_queue, but I think either
* they produce ASCII, or they produce some user-assigned
* string, and in both cases we might assume that it is
@@ -17,12 +17,12 @@
{
if (c < 0x80)
/* 0******* */
-@@ -342,11 +341,21 @@
+@@ -341,11 +340,21 @@
/* 110***** 10****** */
- put_queue(vc, 0xc0 | (c >> 6));
+ put_queue(vc, 0xc0 | (c >> 6));
put_queue(vc, 0x80 | (c & 0x3f));
-- } else {
-+ } else if (c < 0x10000) {
+- } else {
++ } else if (c < 0x10000) {
+ if (c >= 0xD800 && c < 0xE000)
+ return;
+ if (c == 0xFFFF)
@@ -31,16 +31,16 @@
put_queue(vc, 0xe0 | (c >> 12));
put_queue(vc, 0x80 | ((c >> 6) & 0x3f));
put_queue(vc, 0x80 | (c & 0x3f));
-+ } else if (c < 0x110000) {
++ } else if (c < 0x110000) {
+ /* 11110*** 10****** 10****** 10****** */
+ put_queue(vc, 0xf0 | (c >> 18));
+ put_queue(vc, 0x80 | ((c >> 12) & 0x3f));
+ put_queue(vc, 0x80 | ((c >> 6) & 0x3f));
+ put_queue(vc, 0x80 | (c & 0x3f));
- }
+ }
}
-@@ -775,7 +784,7 @@
+@@ -774,7 +783,7 @@
/* kludge */
if (up_flag && shift_state != old_state && npadch != -1) {
if (kbd->kbdmode == VC_UNICODE)
================================================================
Index: SOURCES/linux-2.6.13-imq2.diff
diff -u SOURCES/linux-2.6.13-imq2.diff:1.1.2.4
SOURCES/linux-2.6.13-imq2.diff:1.1.2.5
--- SOURCES/linux-2.6.13-imq2.diff:1.1.2.4 Sat Sep 17 13:58:43 2005
+++ SOURCES/linux-2.6.13-imq2.diff Fri Sep 30 23:52:35 2005
@@ -573,9 +573,9 @@
diff -Nru linux-2.6.13/include/linux/skbuff.h
linux-2.6.13-imq/include/linux/skbuff.h
--- linux-2.6.13/include/linux/skbuff.h 2005-08-28 23:41:01.000000000
+0000
+++ linux-2.6.13-imq/include/linux/skbuff.h 2005-08-29 21:04:31.000000000
+0000
-@@ -263,6 +263,12 @@
- __u32 nfcache;
- __u32 nfctinfo;
+@@ -270,6 +270,12 @@
+ #ifdef CONFIG_NETFILTER
+ __u32 nfmark;
struct nf_conntrack *nfct;
+
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
@@ -583,8 +583,8 @@
+ struct nf_info *nf_info;
+#endif
+
- #ifdef CONFIG_BRIDGE_NETFILTER
- struct nf_bridge_info *nf_bridge;
+ #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
+ __u8 ipvs_property:1;
#endif
diff -Nru linux-2.6.13/net/ipv4/netfilter/Kconfig
linux-2.6.13-imq/net/ipv4/netfilter/Kconfig
--- linux-2.6.13/net/ipv4/netfilter/Kconfig 2005-08-28 23:41:01.000000000
+0000
@@ -727,9 +727,9 @@
obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t_MARK.o
+obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
+ obj-$(CONFIG_IP6_NF_TARGET_HL) += ip6t_HL.o
+ obj-$(CONFIG_IP6_NF_TARGET_NFQUEUE) += ip6t_NFQUEUE.o
obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
- obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
- obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
diff -Nru linux-2.6.13/net/ipv6/netfilter/ip6t_IMQ.c
linux-2.6.13-imq/net/ipv6/netfilter/ip6t_IMQ.c
--- linux-2.6.13/net/ipv6/netfilter/ip6t_IMQ.c 1970-01-01 00:00:00.000000000
+0000
+++ linux-2.6.13-imq/net/ipv6/netfilter/ip6t_IMQ.c 2005-08-29
21:02:39.000000000 +0000
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/2.6.0-t9-acpi_osl-lkml.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/SOURCES/2.6.7-ppc-asm-defs.patch?r1=1.1.2.5&r2=1.1.2.6&f=u
http://cvs.pld-linux.org/SOURCES/kernel-MAX_INIT_ARGS.patch?r1=1.1.2.8&r2=1.1.2.9&f=u
http://cvs.pld-linux.org/SOURCES/linux-2.6-extended-utf8.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/SOURCES/linux-2.6.13-imq2.diff?r1=1.1.2.4&r2=1.1.2.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
