[lake@localhost kernel]$ diff --help
Usage: diff [OPTION]... FILES
Compare FILES line by line.
Mandatory arguments to long options are mandatory for short options too.
--normal output a normal diff (the default)
-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context
-n, --rcs output an RCS format diff
-p, --show-c-function show which C function each change is in
-r, --recursive recursively compare any subdirectories found
--no-dereference don't follow symbolic links
-N, --new-file treat absent files as empty
--unidirectional-new-file treat absent first files as empty
--ignore-file-name-case ignore case when comparing file names
--no-ignore-file-name-case consider case when comparing file names
-a, --text treat all files as text
--strip-trailing-cr strip trailing carriage return on input
-v, --version output version information and exit
[lake@localhost kernel]$ diff -up linux.orig/drivers/soc/bcm/brcmstb/bmem.c linux/drivers/soc/bcm/brcmstb/bmem.c
--- linux.orig/drivers/soc/bcm/brcmstb/bmem.c 2021-01-29 16:08:56.786047179 +0800
+++ linux/drivers/soc/bcm/brcmstb/bmem.c 2021-01-29 16:21:38.712057681 +0800
@@ -220,8 +220,8 @@ void __init bmem_reserve(void (*setup)(p
&bmem_regions[i].addr,
&bmem_regions[i].size, ret);
#ifdef CONFIG_BRCMSTB_AUTOMAP_BMEM
- } else if (memblock_mark_automap(bmem_regions[i].addr,
- bmem_regions[i].size)) {
+ } else if (memblock_mark_automap(bmem_regions[i].addr - guard,
+ bmem_regions[i].size + guard)) {
pr_err("memblock_mark_automap(%pa, %pa) failed\n",
&bmem_regions[i].addr,
&bmem_regions[i].size);
