 96f9359345
			
		
	
	
	96f9359345
	
	
	
		
			
			Commit ffe8018c34 ("initramfs: fix initramfs size calculation") broke
32-bit big-endian arches like (on ARAnyM):
    VFS: Cannot open root device "hda1" or unknown-block(3,1)
    Please append a correct "root=" boot option; here are the available partitions:
    fe80         1059408 nfhd8  (driver?)
      fe81          921600 nfhd8p1 00000000-0000-0000-0000-000000000nfhd8p1
      fe82          137807 nfhd8p2 00000000-0000-0000-0000-000000000nfhd8p2
    0200            3280 fd0  (driver?)
    0201            3280 fd1  (driver?)
    0300         1059408 hda  driver: ide-gd
      0301          921600 hda1 00000000-0000-0000-0000-000000000hda1
      0302          137807 hda2 00000000-0000-0000-0000-000000000hda2
    Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(3,1)
As pointed out by Kerstin Jonsson <kerstin.jonsson@ericsson.com>, this
is due to CONFIG_32BIT not being defined, so the initramfs size field is
done as a 64-bit quad.  On little-endian (like x86) this doesn matter,
but on a big-endian machine the 32-bit reads will see the (zero) high
bits.
Only mips, s390, and score set CONFIG_32BIT for 32-bit builds, so fix it for
all other 32-bit arches by inverting the logic and testing for CONFIG_64BIT,
which should be defined on all 64-bit arches.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
[ I think we should just make it "u64" on all architectures and get
  rid of the whole #ifdef CONFIG_xxBIT   - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
		
	
			
		
			
				
	
	
		
			37 lines
		
	
	
	
		
			1.2 KiB
			
		
	
	
	
		
			ArmAsm
		
	
	
	
	
	
			
		
		
	
	
			37 lines
		
	
	
	
		
			1.2 KiB
			
		
	
	
	
		
			ArmAsm
		
	
	
	
	
	
| /*
 | |
|   initramfs_data includes the compressed binary that is the
 | |
|   filesystem used for early user space.
 | |
|   Note: Older versions of "as" (prior to binutils 2.11.90.0.23
 | |
|   released on 2001-07-14) dit not support .incbin.
 | |
|   If you are forced to use older binutils than that then the
 | |
|   following trick can be applied to create the resulting binary:
 | |
| 
 | |
| 
 | |
|   ld -m elf_i386  --format binary --oformat elf32-i386 -r \
 | |
|   -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o
 | |
|    ld -m elf_i386  -r -o built-in.o initramfs_data.o
 | |
| 
 | |
|   For including the .init.ramfs sections, see include/asm-generic/vmlinux.lds.
 | |
| 
 | |
|   The above example is for i386 - the parameters vary from architectures.
 | |
|   Eventually look up LDFLAGS_BLOB in an older version of the
 | |
|   arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced.
 | |
| 
 | |
|   Using .incbin has the advantage over ld that the correct flags are set
 | |
|   in the ELF header, as required by certain architectures.
 | |
| */
 | |
| 
 | |
| #include <linux/stringify.h>
 | |
| 
 | |
| .section .init.ramfs,"a"
 | |
| __irf_start:
 | |
| .incbin __stringify(INITRAMFS_IMAGE)
 | |
| __irf_end:
 | |
| .section .init.ramfs.info,"a"
 | |
| .globl __initramfs_size
 | |
| __initramfs_size:
 | |
| #ifdef CONFIG_64BIT
 | |
| 	.quad __irf_end - __irf_start
 | |
| #else
 | |
| 	.long __irf_end - __irf_start
 | |
| #endif
 |