The patch titled
Subject: init/do_mounts: initrd_load() can be boolean
has been added to the -mm tree. Its filename is
init-do_mounts-initrd_load-can-be-boolean.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/init-do_mounts-initrd_load-can-be-boolean.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/init-do_mounts-initrd_load-can-be-boolean.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Yaowei Bai <baiyaowei@xxxxxxxxxxxxxxxxxxxx>
Subject: init/do_mounts: initrd_load() can be boolean
Make initrd_load() return bool due to this particular function only using
either one or zero as its return value.
No functional change.
Signed-off-by: Yaowei Bai <baiyaowei@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
init/do_mounts.h | 4 ++--
init/do_mounts_initrd.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff -puN init/do_mounts.h~init-do_mounts-initrd_load-can-be-boolean init/do_mounts.h
--- a/init/do_mounts.h~init-do_mounts-initrd_load-can-be-boolean
+++ a/init/do_mounts.h
@@ -57,11 +57,11 @@ static inline int rd_load_image(char *fr
#ifdef CONFIG_BLK_DEV_INITRD
-int __init initrd_load(void);
+bool __init initrd_load(void);
#else
-static inline int initrd_load(void) { return 0; }
+static inline bool initrd_load(void) { return false; }
#endif
diff -puN init/do_mounts_initrd.c~init-do_mounts-initrd_load-can-be-boolean init/do_mounts_initrd.c
--- a/init/do_mounts_initrd.c~init-do_mounts-initrd_load-can-be-boolean
+++ a/init/do_mounts_initrd.c
@@ -116,7 +116,7 @@ static void __init handle_initrd(void)
}
}
-int __init initrd_load(void)
+bool __init initrd_load(void)
{
if (mount_initrd) {
create_dev("/dev/ram", Root_RAM0);
@@ -129,9 +129,9 @@ int __init initrd_load(void)
if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
sys_unlink("/initrd.image");
handle_initrd();
- return 1;
+ return true;
}
}
sys_unlink("/initrd.image");
- return 0;
+ return false;
}
_
Patches currently in -mm which might be from baiyaowei@xxxxxxxxxxxxxxxxxxxx are
mm-hugetlb-is_file_hugepages-can-be-boolean.patch
mm-memblock-memblock_is_memory-reserved-can-be-boolean.patch
mm-lru-remove-unused-is_unevictable_lru-function.patch
mm-zonelist-enumerate-zonelists-array-index.patch
fs-statc-drop-the-last-new_valid_dev-check.patch
include-linux-kdev_th-remove-new_valid_dev.patch
init-mainc-obsolete_checksetup-can-be-boolean.patch
init-do_mounts-initrd_load-can-be-boolean.patch
ipc-shm-is_file_shm_hugepages-can-be-boolean.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
