Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 boot updates from Ingo Molnar:
 "The biggest changes in this cycle were:

   - reworking of the e820 code: separate in-kernel and boot-ABI data
     structures and apply a whole range of cleanups to the kernel side.

     No change in functionality.

   - enable KASLR by default: it's used by all major distros and it's
     out of the experimental stage as well.

   - ... misc fixes and cleanups"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (63 commits)
  x86/KASLR: Fix kexec kernel boot crash when KASLR randomization fails
  x86/reboot: Turn off KVM when halting a CPU
  x86/boot: Fix BSS corruption/overwrite bug in early x86 kernel startup
  x86: Enable KASLR by default
  boot/param: Move next_arg() function to lib/cmdline.c for later reuse
  x86/boot: Fix Sparse warning by including required header file
  x86/boot/64: Rename start_cpu()
  x86/xen: Update e820 table handling to the new core x86 E820 code
  x86/boot: Fix pr_debug() API braindamage
  xen, x86/headers: Add <linux/device.h> dependency to <asm/xen/page.h>
  x86/boot/e820: Simplify e820__update_table()
  x86/boot/e820: Separate the E820 ABI structures from the in-kernel structures
  x86/boot/e820: Fix and clean up e820_type switch() statements
  x86/boot/e820: Rename the remaining E820 APIs to the e820__*() prefix
  x86/boot/e820: Remove unnecessary #include's
  x86/boot/e820: Rename e820_mark_nosave_regions() to e820__register_nosave_regions()
  x86/boot/e820: Rename e820_reserve_resources*() to e820__reserve_resources*()
  x86/boot/e820: Use bool in query APIs
  x86/boot/e820: Document e820__reserve_setup_data()
  x86/boot/e820: Clean up __e820__update_table() et al
  ...

1 files changed, 0 insertions, 52 deletions

diff --git a/kernel/params.c b/kernel/params.c
index a6d6149c0fe6..60b2d8101355 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -160,58 +160,6 @@ static int parse_one(char *param,
         return -ENOENT;
 }
 
-/* You can use " around spaces, but can't escape ". */
-/* Hyphens and underscores equivalent in parameter names. */
-static char *next_arg(char *args, char **param, char **val)
-{
-        unsigned int i, equals = 0;
-        int in_quote = 0, quoted = 0;
-        char *next;
-
-        if (*args == '"') {
-                args++;
-                in_quote = 1;
-                quoted = 1;
-        }
-
-        for (i = 0; args[i]; i++) {
-                if (isspace(args[i]) && !in_quote)
-                        break;
-                if (equals == 0) {
-                        if (args[i] == '=')
-                                equals = i;
-                }
-                if (args[i] == '"')
-                        in_quote = !in_quote;
-        }
-
-        *param = args;
-        if (!equals)
-                *val = NULL;
-        else {
-                args[equals] = '\0';
-                *val = args + equals + 1;
-
-                /* Don't include quotes in value. */
-                if (**val == '"') {
-                        (*val)++;
-                        if (args[i-1] == '"')
-                                args[i-1] = '\0';
-                }
-        }
-        if (quoted && args[i-1] == '"')
-                args[i-1] = '\0';
-
-        if (args[i]) {
-                args[i] = '\0';
-                next = args + i + 1;
-        } else
-                next = args + i;
-
-        /* Chew up trailing spaces. */
-        return skip_spaces(next);
-}
-
 /* Args looks like "foo=bar,bar2 baz=fuz wiz". */
 char *parse_args(const char *doing,
                  char *args,