linux: fix linux64 initramfs load
tux@slitaz:~$ dmesg | grep -A 5 initramfs
Trying to unpack rootfs image as initramfs...
....................................
Freeing initrd memory: 52k freed
PCI-DMA: Using software bounce buffering for IO (SWIOTLB)
Placing 64MB software IO TLB between ffff8800c748e000 - ffff8800cb48e000
software IO TLB at phys 0xc748e000 - 0xcb48e000
1.
wok log linux/stuff/linux-freeinitrd.u (0) tip
http://hg.slitaz.org/wok/log/08f5bc0133f6/linux/stuff/linux-freeinitrd.u
age author description
2 days ago Pascal Bellard linux: fix linux64 initramfs load
8 months ago Pascal Bellard Up linux (3.2.53) again...
2012-04-15 Christophe Lincoln Up: linux (3.2.14) Let play with the kernel :-)
2.
wok log
http://hg.slitaz.org/wok/3.
wok changeset 17037:08f5bc0133f6
linux: fix linux64 initramfs load
| author | Pascal Bellard <pascal.bellard@slitaz.org> | ||
|---|---|---|---|
| date | Mon Aug 18 23:02:00 2014 +0200 (29 hours ago ago) | ||
| parents | 2dd00d63b1d6 | ||
| children | de89db694ed0 | ||
| files | linux/stuff/linux-freeinitrd.u |
# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1408395720 -7200
# Node ID 08f5bc0133f6276e5ff1421ae2fcb7f555884496
# Parent 2dd00d63b1d6567ea6fd7942f6f175e7bd8b8c60
linux: fix linux64 initramfs load
diff -r 2dd00d63b1d6 -r 08f5bc0133f6 linux/stuff/linux-freeinitrd.u
--- a/linux/stuff/linux-freeinitrd.u Mon Aug 18 23:00:41 2014 +0200
+++ b/linux/stuff/linux-freeinitrd.u Mon Aug 18 23:02:00 2014 +0200
@@ -5,7 +5,7 @@
set_memory_rw(begin, (end - begin) >> PAGE_SHIFT);
- printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
-+ if (what) printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
++ if (what && *what) printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
for (; addr < end; addr += PAGE_SIZE) {
ClearPageReserved(virt_to_page(addr));
@@ -22,22 +22,22 @@
+
+static void free_rootfs_mem(unsigned long start, unsigned long end)
+{
-+ free_init_pages(NULL, start, end);
++ free_init_pages("", start, end);
+}
+
+static void _free_initrd(unsigned long initrd_start, unsigned long initrd_end,
+ void (*free_initrd_mem)(unsigned long, unsigned long));
+
+static struct {
-+ int offset, last, inptr, freed;
++ unsigned long offset, last, inptr, freed;
+ char *max;
+} fill;
+
+static void release_inbuf(unsigned n)
+{
+ if (n >= INITRD_PAGE) {
-+ unsigned rem = n % INITRD_PAGE;
-+ unsigned end = initrd_start + n - rem;
++ unsigned long rem = n % INITRD_PAGE;
++ unsigned long end = initrd_start + n - rem;
+ _free_initrd(initrd_start, end, free_rootfs_mem);
+ fill.freed += n - rem;
+ if (fill.freed >= INITRD_DOT) {
@@ -49,9 +49,9 @@
+ }
+}
+
-+static int fill_buffer(void *buffer, unsigned size)
++static unsigned long fill_buffer(void *buffer, unsigned size)
+{
-+ int max = fill.max - (char *) initrd_start - fill.offset;
++ unsigned long max = fill.max - (char *) initrd_start - fill.offset;
+ if (max > size) max = size;
+ if (max > INITRD_PAGE) max = INITRD_PAGE;
+ memcpy(buffer, (void *)(initrd_start + fill.offset), max);
4.
wok changeset 17027:5803f5a52a59
linux64: new module path
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sat Aug 16 14:43:53 2014 +0200 (6 days ago ago) |
| parents | 8a3c0ff3e79a |
| children | 889f25f00105 |
| files | linux/stuff/linux-slitaz.config64 |
# HG changeset patch # User Pascal Bellard <pascal.bellard@slitaz.org> # Date 1408193033 -7200 # Node ID 5803f5a52a5967a3b17fae6f8189027c57bd8343 # Parent 8a3c0ff3e79ac00ea6b4df6067367250cd74eaf7 linux64: new module path diff -r 8a3c0ff3e79a -r 5803f5a52a59 linux/stuff/linux-slitaz.config64 --- a/linux/stuff/linux-slitaz.config64 Sat Aug 16 00:15:04 2014 +0200 +++ b/linux/stuff/linux-slitaz.config64 Sat Aug 16 14:43:53 2014 +0200 @@ -61,7 +61,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="uclibc-x86_64-" -CONFIG_LOCALVERSION="-slitaz" +CONFIG_LOCALVERSION="-slitaz64" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -142,7 +142,7 @@ # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="initrd.cpio" +CONFIG_INITRAMFS_SOURCE="" CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_RD_GZIP=y
5.
flavors changeset 219:84449f90bc26 tip
core64: do not install linux/32 !
| author | Pascal Bellard <pascal.bellard@slitaz.org> | ||
|---|---|---|---|
| date | Sun Aug 17 17:16:41 2014 +0200 (5 days ago ago) | ||
| parents | 89fe96ff7f00 | ||
| children | |||
| files | core64/packages.list |
# HG changeset patch # User Pascal Bellard <pascal.bellard@slitaz.org> # Date 1408288601 -7200 # Node ID 84449f90bc26c8cf4c713f6bc4aa210c55578e8f # Parent 89fe96ff7f005fea845be17396792577e4ca217d core64: do not install linux/32 ! diff -r 89fe96ff7f00 -r 84449f90bc26 core64/packages.list --- a/core64/packages.list Mon May 19 12:21:36 2014 +0200 +++ b/core64/packages.list Sun Aug 17 17:16:41 2014 +0200 @@ -1,3 +1,8 @@ +linux64 +linux64-crypto +linux64-firmware +linux64-sound +linux64-wireless 915resolution acl alsa-lib @@ -83,11 +88,6 @@ libxcb libxml2 libxslt -linux64 -linux64-crypto -linux64-firmware -linux64-sound -linux64-wireless locale-de locale-es locale-fr
