Author: pluto Date: Fri Sep 30 22:31:55 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated for 2.6.14.
---- Files affected:
SOURCES:
acpi-dsdt-initramfs-fix-2.6.10-cleanup.patch (1.1.2.1 -> 1.1.2.2) ,
acpi-dsdt-initrd-v0.7d-2.6.12.patch (1.1.2.1 -> 1.1.2.2) ,
bootsplash-3.1.6-2.6.13.diff (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/acpi-dsdt-initramfs-fix-2.6.10-cleanup.patch
diff -u SOURCES/acpi-dsdt-initramfs-fix-2.6.10-cleanup.patch:1.1.2.1
SOURCES/acpi-dsdt-initramfs-fix-2.6.10-cleanup.patch:1.1.2.2
--- SOURCES/acpi-dsdt-initramfs-fix-2.6.10-cleanup.patch:1.1.2.1 Thu Aug
11 18:49:09 2005
+++ SOURCES/acpi-dsdt-initramfs-fix-2.6.10-cleanup.patch Sat Oct 1
00:31:49 2005
@@ -1,7 +1,7 @@
---- linux-2.6.11-rc4/./init/initramfs.c.bak 2005-02-23 00:42:19.000000000
+0100
-+++ linux-2.6.11-rc4/./init/initramfs.c 2005-02-23 00:53:42.000000000
+0100
-@@ -468,6 +468,31 @@ extern char __initramfs_start[], __initr
- #include <linux/initrd.h>
+--- linux-2.6.14-rc2/init/initramfs.c.orig 2005-09-20 03:00:41.000000000
+0000
++++ linux-2.6.14-rc2/init/initramfs.c 2005-09-30 22:29:39.415278696 +0000
+@@ -476,6 +476,31 @@
+
#endif
+#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
@@ -32,7 +32,7 @@
void __init populate_rootfs(void)
{
char *err = unpack_to_rootfs(__initramfs_start,
-@@ -477,13 +502,22 @@ void __init populate_rootfs(void)
+@@ -485,13 +510,22 @@
#ifdef CONFIG_BLK_DEV_INITRD
if (initrd_start) {
int fd;
@@ -54,6 +54,15 @@
unpack_to_rootfs((char *)initrd_start,
- initrd_end - initrd_start, 0);
+ initramfs_len, 0);
- free_initrd_mem(initrd_start, initrd_end);
+ free_initrd();
return;
+ }
+@@ -499,7 +533,7 @@
+ fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 700);
+ if (fd >= 0) {
+ sys_write(fd, (char *)initrd_start,
+- initrd_end - initrd_start);
++ initramfs_len);
+ sys_close(fd);
+ free_initrd();
}
================================================================
Index: SOURCES/acpi-dsdt-initrd-v0.7d-2.6.12.patch
diff -u SOURCES/acpi-dsdt-initrd-v0.7d-2.6.12.patch:1.1.2.1
SOURCES/acpi-dsdt-initrd-v0.7d-2.6.12.patch:1.1.2.2
--- SOURCES/acpi-dsdt-initrd-v0.7d-2.6.12.patch:1.1.2.1 Thu Aug 11 18:49:09 2005
+++ SOURCES/acpi-dsdt-initrd-v0.7d-2.6.12.patch Sat Oct 1 00:31:50 2005
@@ -87,7 +87,7 @@
#include <linux/workqueue.h>
#include <linux/nmi.h>
#include <acpi/acpi.h>
-@@ -246,6 +247,43 @@ acpi_os_predefined_override (const struc
+@@ -245,6 +246,43 @@
return AE_OK;
}
@@ -129,9 +129,9 @@
+#endif
+
acpi_status
- acpi_os_table_override (struct acpi_table_header *existing_table,
- struct acpi_table_header **new_table)
-@@ -253,13 +291,18 @@ acpi_os_table_override (struct acpi_tabl
+ acpi_os_table_override(struct acpi_table_header * existing_table,
+ struct acpi_table_header ** new_table)
+@@ -252,13 +290,18 @@
if (!existing_table || !new_table)
return AE_BAD_PARAMETER;
@@ -139,7 +139,7 @@
+
#ifdef CONFIG_ACPI_CUSTOM_DSDT
if (strncmp(existing_table->signature, "DSDT", 4) == 0)
- *new_table = (struct acpi_table_header*)AmlCode;
+ *new_table = (struct acpi_table_header *)AmlCode;
- else
- *new_table = NULL;
-#else
================================================================
Index: SOURCES/bootsplash-3.1.6-2.6.13.diff
diff -u SOURCES/bootsplash-3.1.6-2.6.13.diff:1.1.2.1
SOURCES/bootsplash-3.1.6-2.6.13.diff:1.1.2.2
--- SOURCES/bootsplash-3.1.6-2.6.13.diff:1.1.2.1 Sun Sep 11 17:27:48 2005
+++ SOURCES/bootsplash-3.1.6-2.6.13.diff Sat Oct 1 00:31:50 2005
@@ -2563,7 +2563,7 @@
static signed char con2fb_map_boot[MAX_NR_CONSOLES];
static int logo_height;
static int logo_lines;
-@@ -403,6 +406,10 @@
+@@ -452,6 +455,10 @@
for (i = first_fb_vc; i <= last_fb_vc; i++)
con2fb_map[i] = info_idx;
@@ -2574,7 +2574,7 @@
err = take_over_console(&fb_con, first_fb_vc, last_fb_vc,
fbcon_is_default);
if (err) {
-@@ -949,6 +956,16 @@
+@@ -969,6 +976,16 @@
rows = vc->vc_rows;
new_cols = info->var.xres / vc->vc_font.width;
new_rows = info->var.yres / vc->vc_font.height;
@@ -2591,7 +2591,7 @@
vc_resize(vc, new_cols, new_rows);
ops = info->fbcon_par;
-@@ -1578,6 +1595,10 @@
+@@ -1603,6 +1620,10 @@
fbcon_softback_note(vc, t, count);
if (logo_shown >= 0)
goto redraw_up;
@@ -2602,10 +2602,10 @@
switch (p->scrollmode) {
case SCROLL_MOVE:
ops->bmove(vc, info, t + count, 0, t, 0,
-@@ -1662,6 +1683,10 @@
- case SM_DOWN:
- if (count > vc->vc_rows) /* Maximum realistic size */
+@@ -1689,6 +1710,10 @@
count = vc->vc_rows;
+ if (logo_shown >= 0)
+ goto redraw_down;
+#ifdef CONFIG_BOOTSPLASH
+ if (info->splash_data)
+ goto redraw_down;
@@ -2613,7 +2613,7 @@
switch (p->scrollmode) {
case SCROLL_MOVE:
ops->bmove(vc, info, t, 0, t + count, 0,
-@@ -1804,6 +1829,14 @@
+@@ -1831,6 +1856,14 @@
}
return;
}
@@ -2628,7 +2628,7 @@
ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
height, width);
}
-@@ -1905,6 +1938,10 @@
+@@ -1932,6 +1965,10 @@
info = registered_fb[con2fb_map[vc->vc_num]];
@@ -2639,7 +2639,7 @@
if (softback_top) {
int l = fbcon_softback_size / vc->vc_size_row;
if (softback_lines)
-@@ -2009,6 +2046,12 @@
+@@ -2039,6 +2076,12 @@
static void fbcon_generic_blank(struct vc_data *vc, struct fb_info *info,
int blank)
{
@@ -2652,7 +2652,7 @@
if (blank) {
unsigned short charmask = vc->vc_hi_font_mask ?
0x1ff : 0xff;
-@@ -2197,8 +2240,15 @@
+@@ -2232,8 +2275,15 @@
}
if (resize) {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/acpi-dsdt-initramfs-fix-2.6.10-cleanup.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/SOURCES/acpi-dsdt-initrd-v0.7d-2.6.12.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/SOURCES/bootsplash-3.1.6-2.6.13.diff?r1=1.1.2.1&r2=1.1.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
