Skip to content

Commit ff04e9c

Browse files
akpm00sfrothwell
authored andcommitted
initrdmem=-option-to-specify-initrd-physical-address-checkpatch-fixes
Cc: Borislav Petkov <[email protected]> WARNING: 'adddress' may be misspelled - perhaps 'address'? torvalds#64: FILE: Documentation/admin-guide/kernel-parameters.txt:1717: + initrdmem= [KNL] Specify a physical adddress and size from which WARNING: please, no spaces at the start of a line torvalds#82: FILE: arch/x86/kernel/setup.c:240: + if (ramdisk_image == 0) {$ WARNING: braces {} are not necessary for single statement blocks torvalds#82: FILE: arch/x86/kernel/setup.c:240: + if (ramdisk_image == 0) { + ramdisk_image = phys_initrd_start; + } ERROR: code indent should use tabs where possible torvalds#83: FILE: arch/x86/kernel/setup.c:241: + ramdisk_image = phys_initrd_start;$ WARNING: please, no spaces at the start of a line torvalds#83: FILE: arch/x86/kernel/setup.c:241: + ramdisk_image = phys_initrd_start;$ WARNING: please, no spaces at the start of a line torvalds#84: FILE: arch/x86/kernel/setup.c:242: + }$ WARNING: please, no spaces at the start of a line torvalds#92: FILE: arch/x86/kernel/setup.c:251: + if (ramdisk_size == 0) {$ WARNING: braces {} are not necessary for single statement blocks torvalds#92: FILE: arch/x86/kernel/setup.c:251: + if (ramdisk_size == 0) { + ramdisk_size = phys_initrd_size; + } ERROR: code indent should use tabs where possible torvalds#93: FILE: arch/x86/kernel/setup.c:252: + ramdisk_size = phys_initrd_size;$ WARNING: please, no spaces at the start of a line torvalds#93: FILE: arch/x86/kernel/setup.c:252: + ramdisk_size = phys_initrd_size;$ WARNING: please, no spaces at the start of a line torvalds#94: FILE: arch/x86/kernel/setup.c:253: + }$ WARNING: please, no spaces at the start of a line torvalds#124: FILE: init/do_mounts_initrd.c:55: + return early_initrdmem(p);$ WARNING: Missing Signed-off-by: line by nominal patch author 'ron minnich <[email protected]>' total: 2 errors, 11 warnings, 56 lines checked NOTE: For some of the reported defects, checkpatch may be able to mechanically convert to the typical style using --fix or --fix-inplace. NOTE: Whitespace errors detected. You may wish to use scripts/cleanpatch or scripts/cleanfile ./patches/initrdmem=-option-to-specify-initrd-physical-address.patch has style problems, please review. NOTE: If any of the errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. Please run checkpatch prior to sending patches Cc: Borislav Petkov <[email protected]> Cc: H. Peter Anvin (Intel) <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Matthew Garrett <[email protected]> Cc: Randy Dunlap <[email protected]> Cc: Ronald G. Minnich <[email protected]> Cc: Thomas Gleixner <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Stephen Rothwell <[email protected]>
1 parent 33f0f53 commit ff04e9c

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

Diff for: Documentation/admin-guide/kernel-parameters.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1762,12 +1762,12 @@
17621762

17631763
initrd= [BOOT] Specify the location of the initial ramdisk
17641764

1765-
initrdmem= [KNL] Specify a physical adddress and size from which
1766-
to load the initrd. If an initrd is compiled in or
1767-
specified in the bootparams, it takes priority
1768-
over this setting.
1769-
Format: ss[KMG],nn[KMG]
1770-
Default is 0, 0
1765+
initrdmem= [KNL] Specify a physical address and size from which to
1766+
load the initrd. If an initrd is compiled in or
1767+
specified in the bootparams, it takes priority over this
1768+
setting.
1769+
Format: ss[KMG],nn[KMG]
1770+
Default is 0, 0
17711771

17721772
init_on_alloc= [MM] Fill newly allocated pages and heap objects with
17731773
zeroes.

Diff for: arch/x86/kernel/setup.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,9 @@ static u64 __init get_ramdisk_image(void)
237237

238238
ramdisk_image |= (u64)boot_params.ext_ramdisk_image << 32;
239239

240-
if (ramdisk_image == 0) {
241-
ramdisk_image = phys_initrd_start;
242-
}
240+
if (ramdisk_image == 0)
241+
ramdisk_image = phys_initrd_start;
242+
243243
return ramdisk_image;
244244
}
245245
static u64 __init get_ramdisk_size(void)
@@ -248,9 +248,9 @@ static u64 __init get_ramdisk_size(void)
248248

249249
ramdisk_size |= (u64)boot_params.ext_ramdisk_size << 32;
250250

251-
if (ramdisk_size == 0) {
252-
ramdisk_size = phys_initrd_size;
253-
}
251+
if (ramdisk_size == 0)
252+
ramdisk_size = phys_initrd_size;
253+
254254
return ramdisk_size;
255255
}
256256

Diff for: init/do_mounts_initrd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ early_param("initrdmem", early_initrdmem);
5252
*/
5353
static int __init early_initrd(char *p)
5454
{
55-
return early_initrdmem(p);
55+
return early_initrdmem(p);
5656
}
5757
early_param("initrd", early_initrd);
5858

0 commit comments

Comments
 (0)