--- arch/x86/boot/compressed/misc.c | 24 ------------------------ arch/x86/boot/compressed/misc.h | 10 ---------- arch/x86/boot/compressed/pagetable.c | 2 -- 3 files changed, 36 deletions(-) Index: linux-2.6/arch/x86/boot/compressed/misc.c =================================================================== --- linux-2.6.orig/arch/x86/boot/compressed/misc.c +++ linux-2.6/arch/x86/boot/compressed/misc.c @@ -152,23 +152,6 @@ void __putstr(const char *s) outb(0xff & (pos >> 1), vidport+1); } -void __puthex(unsigned long value) -{ - char alpha[2] = "0"; - int bits; - - for (bits = sizeof(value) * 8 - 4; bits >= 0; bits -= 4) { - unsigned long digit = (value >> bits) & 0xf; - - if (digit < 0xA) - alpha[0] = '0' + digit; - else - alpha[0] = 'a' + (digit - 0xA); - - __putstr(alpha); - } -} - #if CONFIG_X86_NEED_RELOCS static void handle_relocations(void *output, unsigned long output_len, unsigned long virt_addr) @@ -365,13 +348,6 @@ asmlinkage __visible void *extract_kerne free_mem_ptr = heap; /* Heap */ free_mem_end_ptr = heap + BOOT_HEAP_SIZE; - /* Report initial kernel position details. */ - debug_putaddr(input_data); - debug_putaddr(input_len); - debug_putaddr(output); - debug_putaddr(output_len); - debug_putaddr(kernel_total_size); - /* * The memory hole needed for the kernel is the larger of either * the entire decompressed kernel plus relocation table, or the Index: linux-2.6/arch/x86/boot/compressed/misc.h =================================================================== --- linux-2.6.orig/arch/x86/boot/compressed/misc.h +++ linux-2.6/arch/x86/boot/compressed/misc.h @@ -34,27 +34,17 @@ extern memptr free_mem_ptr; extern memptr free_mem_end_ptr; extern struct boot_params *boot_params; void __putstr(const char *s); -void __puthex(unsigned long value); #define error_putstr(__x) __putstr(__x) #define error_puthex(__x) __puthex(__x) #ifdef CONFIG_X86_VERBOSE_BOOTUP #define debug_putstr(__x) __putstr(__x) -#define debug_puthex(__x) __puthex(__x) -#define debug_putaddr(__x) { \ - debug_putstr(#__x ": 0x"); \ - debug_puthex((unsigned long)(__x)); \ - debug_putstr("\n"); \ - } #else static inline void debug_putstr(const char *s) { } -static inline void debug_puthex(const char *s) -{ } -#define debug_putaddr(x) /* */ #endif Index: linux-2.6/arch/x86/boot/compressed/pagetable.c =================================================================== --- linux-2.6.orig/arch/x86/boot/compressed/pagetable.c +++ linux-2.6/arch/x86/boot/compressed/pagetable.c @@ -45,8 +45,6 @@ static void *alloc_pgt_page(void *contex /* Validate there is space available for a new page. */ if (pages->pgt_buf_offset >= pages->pgt_buf_size) { debug_putstr("out of pgt_buf in " __FILE__ "!?\n"); - debug_putaddr(pages->pgt_buf_offset); - debug_putaddr(pages->pgt_buf_size); return NULL; }