Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4549448 authored by Domen Puncer's avatar Domen Puncer Committed by Linus Torvalds
Browse files

[PATCH] x86_64: coding style and whitespace fixups 



Remove some of the unnecessary differences between arch/i386 and
arch/x86_64.  This patch fixes more whitespace issues, some miscellaneous
typos, a wrong URL and a factually incorrect statement about the current
boot sector code.

Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 23712b2f

arch/i386/boot/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA 


#RAMDISK := -DRAMDISK=512



targets		:= vmlinux.bin bootsect bootsect.o setup setup.o \

		   zImage bzImage

targets		:= vmlinux.bin bootsect bootsect.o \

		   setup setup.o zImage bzImage

subdir- 	:= compressed



hostprogs-y	:= tools/build

arch/i386/boot/compressed/misc.c

+0 −1
Original line number Diff line number Diff line
@@ -354,7 +354,6 @@ static void close_output_buffer_if_we_run_high(struct moveparams *mv) 
	}

}





asmlinkage int decompress_kernel(struct moveparams *mv, void *rmode)

{

	real_mode = rmode;

arch/i386/boot/edd.S

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *   projects 1572D, 1484D, 1386D, 1226DT

 * disk signature read by Matt Domsch <Matt_Domsch@dell.com>

 *	and Andrew Wilks <Andrew_Wilks@dell.com> September 2003, June 2004

 * legacy CHS retreival by Patrick J. LoPresti <patl@users.sourceforge.net>

 * legacy CHS retrieval by Patrick J. LoPresti <patl@users.sourceforge.net>

 *      March 2004

 * Command line option parsing, Matt Domsch, November 2004

 */

arch/i386/boot/setup.S

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
 * Transcribed from Intel (as86) -> AT&T (gas) by Chris Noe, May 1999.

 * <stiker@northlink.com>

 *

 * Fix to work around buggy BIOSes which dont use carry bit correctly

 * Fix to work around buggy BIOSes which don't use carry bit correctly

 * and/or report extended memory in CX/DX for e801h memory size detection 

 * call.  As a result the kernel got wrong figures.  The int15/e801h docs

 * from Ralf Brown interrupt list seem to indicate AX/BX should be used
@@ -357,7 +357,7 @@ bail820: 


meme801:

	stc					# fix to work around buggy

	xorw	%cx,%cx				# BIOSes which dont clear/set

	xorw	%cx,%cx				# BIOSes which don't clear/set

	xorw	%dx,%dx				# carry on pass/error of

						# e801h memory size call

						# or merely pass cx,dx though

arch/i386/boot/tools/build.c

+2 −3
Original line number Diff line number Diff line 
/*

 *  $Id: build.c,v 1.5 1997/05/19 12:29:58 mj Exp $

 *

 *  Copyright (C) 1991, 1992  Linus Torvalds

 *  Copyright (C) 1997 Martin Mares

 */
@@ -8,7 +6,8 @@ 
/*

 * This file builds a disk-image from three different files:

 *

 * - bootsect: exactly 512 bytes of 8086 machine code, loads the rest

 * - bootsect: compatibility mbr which prints an error message if

 *             someone tries to boot the kernel directly.

 * - setup: 8086 machine code, sets up system parm

 * - system: 80386 code for actual system

 *