Index: kernel/genarch/src/multiboot/common.c
===================================================================
--- kernel/genarch/src/multiboot/common.c	(revision ae8d7b08ee87b5250ac55eb2e4d59710943f445a)
+++ kernel/genarch/src/multiboot/common.c	(revision ae8d7b08ee87b5250ac55eb2e4d59710943f445a)
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2017 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup genarch
+ * @{
+ */
+/** @file
+ */
+
+#include <genarch/multiboot/multiboot.h>
+#include <config.h>
+#include <stddef.h>
+
+void multiboot_cmdline(const char *cmdline)
+{
+	/*
+	 * GRUB passes the command line in an escaped form.
+	 */
+	for (size_t i = 0, j = 0;
+	    cmdline[i] && j < CONFIG_BOOT_ARGUMENTS_BUFLEN;
+	    i++, j++) {
+		if (cmdline[i] == '\\') {
+			switch (cmdline[i + 1]) {
+			case '\\':
+			case '\'':
+			case '\"':
+				i++;
+				break;
+			}
+		}
+		bargs[j] = cmdline[i];
+	}
+}
+
+/** @}
+ */
Index: kernel/genarch/src/multiboot/multiboot.c
===================================================================
--- kernel/genarch/src/multiboot/multiboot.c	(revision 9ef1fadef604b9c3871bb759de90bf613963a180)
+++ kernel/genarch/src/multiboot/multiboot.c	(revision ae8d7b08ee87b5250ac55eb2e4d59710943f445a)
@@ -101,25 +101,4 @@
 }
 
-static void multiboot_cmdline(char *cmdline)
-{
-	/*
-	 * GRUB passes the command line in an escaped form.
-	 */
-	for (size_t i = 0, j = 0;
-	    cmdline[i] && j < CONFIG_BOOT_ARGUMENTS_BUFLEN;
-	    i++, j++) {
-		if (cmdline[i] == '\\') {
-			switch (cmdline[i + 1]) {
-			case '\\':
-			case '\'':
-			case '\"':
-				i++;
-				break;
-			}
-		}
-		bargs[j] = cmdline[i];
-	} 
-}
-
 static void multiboot_modules(uint32_t count, multiboot_module_t *mods)
 {
Index: kernel/genarch/src/multiboot/multiboot2.c
===================================================================
--- kernel/genarch/src/multiboot/multiboot2.c	(revision 9ef1fadef604b9c3871bb759de90bf613963a180)
+++ kernel/genarch/src/multiboot/multiboot2.c	(revision ae8d7b08ee87b5250ac55eb2e4d59710943f445a)
@@ -44,21 +44,5 @@
 static void multiboot2_cmdline(const multiboot2_cmdline_t *module)
 {
-	/*
-	 * GRUB passes the command line in an escaped form.
-	 */
-	for (size_t i = 0, j = 0;
-	    module->string[i] && j < CONFIG_BOOT_ARGUMENTS_BUFLEN;
-	    i++, j++) {
-		if (module->string[i] == '\\') {
-			switch (module->string[i + 1]) {
-			case '\\':
-			case '\'':
-			case '\"':
-				i++;
-				break;
-			}
-		}
-		bargs[j] = module->string[i];
-	} 
+	multiboot_cmdline(module->string);
 }