diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-12-14 22:01:55 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-12-14 22:01:55 +0100 |
| commit | 8990c1bc4be46473ad19bf2fa612ca57286f3df4 (patch) | |
| tree | 3cea60576903a1d26c67e6ec62891b524d390e95 /usr | |
| parent | 2979076fbf17a0947d6eba367b0cac19c907c160 (diff) | |
| parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) | |
| download | linux-8990c1bc4be46473ad19bf2fa612ca57286f3df4.tar.bz2 | |
Merge commit 'v2.6.37-rc1' into kbuild/kbuild
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/Kconfig | 2 | ||||
| -rw-r--r-- | usr/initramfs_data.S | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr/Kconfig b/usr/Kconfig index e2721f5a3504..c2c7fe2f717d 100644 --- a/usr/Kconfig +++ b/usr/Kconfig @@ -144,7 +144,7 @@ config INITRAMFS_COMPRESSION_LZO depends on RD_LZO help Its compression ratio is the poorest among the four. The kernel - size is about about 10% bigger than gzip; however its speed + size is about 10% bigger than gzip; however its speed (both compression and decompression) is the fastest. endchoice diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S index b9efed5e35cc..792a750d9441 100644 --- a/usr/initramfs_data.S +++ b/usr/initramfs_data.S @@ -30,8 +30,8 @@ __irf_end: .section .init.ramfs.info,"a" .globl __initramfs_size __initramfs_size: -#ifdef CONFIG_32BIT - .long __irf_end - __irf_start -#else +#ifdef CONFIG_64BIT .quad __irf_end - __irf_start +#else + .long __irf_end - __irf_start #endif |