From aefe6465efa9a207bbad4b93e50e982535b4f0cb Mon Sep 17 00:00:00 2001 From: Joe Millenbach Date: Thu, 19 Jul 2012 18:04:40 -0700 Subject: [PATCH] --- yaml --- r: 318412 b: refs/heads/master c: 641a1cebfe2f05fa1a48503d816fc70cf707d033 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/boot/compressed/misc.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8647a2406074..9c61dfcbbf22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7aac3015b533add3e85222f9fd2ab66216b38746 +refs/heads/master: 641a1cebfe2f05fa1a48503d816fc70cf707d033 diff --git a/trunk/arch/x86/boot/compressed/misc.c b/trunk/arch/x86/boot/compressed/misc.c index 8c29f82b15e4..88f7ff6da404 100644 --- a/trunk/arch/x86/boot/compressed/misc.c +++ b/trunk/arch/x86/boot/compressed/misc.c @@ -108,7 +108,6 @@ static void error(char *m); * This is set up by the setup-routine at boot-time */ struct boot_params *real_mode; /* Pointer to real-mode data */ -static int debug; void *memset(void *s, int c, size_t n); void *memcpy(void *dest, const void *src, size_t n); @@ -326,9 +325,6 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, { real_mode = rmode; - if (cmdline_find_option_bool("debug")) - debug = 1; - if (real_mode->screen_info.orig_video_mode == 7) { vidmem = (char *) 0xb0000; vidport = 0x3b4;