---

yaml
---
r: 72638
b: refs/heads/master
c: 18134be
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26adc0d5859788b74f86677538236f807e6d9021
+refs/heads/master: 18134bed02e230a7876570072b0284635daaa32b

trunk/Makefile

@@ -196,9 +196,6 @@ CROSS_COMPILE	?=
 UTS_MACHINE 	:= $(ARCH)
 SRCARCH 	:= $(ARCH)
 
-# for i386 and x86_64 we use SRCARCH equal to x86
-SRCARCH := $(if $(filter x86_64 i386,$(SRCARCH)),x86,$(SRCARCH))
-
 KCONFIG_CONFIG	?= .config
 
 # SHELL used by kbuild
@@ -421,7 +418,7 @@ ifeq ($(config-targets),1)
 # Read arch specific Makefile to set KBUILD_DEFCONFIG as needed.
 # KBUILD_DEFCONFIG may point out an alternative default configuration
 # used for 'make defconfig'
-include $(srctree)/arch/$(SRCARCH)/Makefile
+include $(srctree)/arch/$(ARCH)/Makefile
 export KBUILD_DEFCONFIG
 
 config %config: scripts_basic outputmakefile FORCE
@@ -500,7 +497,7 @@ else
 KBUILD_CFLAGS	+= -O2
 endif
 
-include $(srctree)/arch/$(SRCARCH)/Makefile
+include $(srctree)/arch/$(ARCH)/Makefile
 
 ifdef CONFIG_FRAME_POINTER
 KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls

trunk/arch/i386/.gitignore

@@ -0,0 +1 @@
+boot

trunk/arch/x86/Kconfig.i386 → trunk/arch/i386/Kconfig

@@ -287,7 +287,7 @@ config ES7000_CLUSTERED_APIC
 	default y
 	depends on SMP && X86_ES7000 && MPENTIUMIII
 
-source "arch/x86/Kconfig.cpu"
+source "arch/i386/Kconfig.cpu"
 
 config HPET_TIMER
 	bool "HPET Timer Support"
@@ -1272,7 +1272,7 @@ source "fs/Kconfig"
 
 source "kernel/Kconfig.instrumentation"
 
-source "arch/x86/Kconfig.debug"
+source "arch/i386/Kconfig.debug"
 
 source "security/Kconfig"
 

trunk/arch/x86/Kconfig.debug → trunk/arch/i386/Kconfig.debug

@@ -1,14 +1,14 @@
 menu "Kernel hacking"
 
 config TRACE_IRQFLAGS_SUPPORT
-	def_bool y
+	bool
+	default y
 
 source "lib/Kconfig.debug"
 
 config EARLY_PRINTK
 	bool "Early printk" if EMBEDDED && DEBUG_KERNEL
 	default y
-	depends on X86_32
 	help
 	  Write kernel log output directly into the VGA buffer or to a serial
 	  port.
@@ -37,12 +37,10 @@ config DEBUG_STACK_USAGE
 
 comment "Page alloc debug is incompatible with Software Suspend on i386"
 	depends on DEBUG_KERNEL && HIBERNATION
-	depends on X86_32
 
 config DEBUG_PAGEALLOC
 	bool "Debug page memory allocations"
 	depends on DEBUG_KERNEL && !HIBERNATION && !HUGETLBFS
-	depends on X86_32
 	help
 	  Unmap pages from the kernel linear mapping after free_pages().
 	  This results in a large slowdown, but helps to find certain types
@@ -61,7 +59,6 @@ config DEBUG_RODATA
 config 4KSTACKS
 	bool "Use 4Kb for kernel stacks instead of 8Kb"
 	depends on DEBUG_KERNEL
-	depends on X86_32
 	help
 	  If you say Y here the kernel will use a 4Kb stacksize for the
 	  kernel stack attached to each process/thread. This facilitates
@@ -70,50 +67,22 @@ config 4KSTACKS
 	  will also use IRQ stacks to compensate for the reduced stackspace.
 
 config X86_FIND_SMP_CONFIG
-	def_bool y
+	bool
 	depends on X86_LOCAL_APIC || X86_VOYAGER
-	depends on X86_32
+	default y
 
 config X86_MPPARSE
-	def_bool y
+	bool
 	depends on X86_LOCAL_APIC && !X86_VISWS
-	depends on X86_32
+	default y
 
 config DOUBLEFAULT
 	default y
 	bool "Enable doublefault exception handler" if EMBEDDED
-	depends on X86_32
-	help
-	  This option allows trapping of rare doublefault exceptions that
-	  would otherwise cause a system to silently reboot. Disabling this
-	  option saves about 4k and might cause you much additional grey
-	  hair.
-
-config IOMMU_DEBUG
-	bool "Enable IOMMU debugging"
-	depends on IOMMU && DEBUG_KERNEL
-	depends on X86_64
 	help
-	  Force the IOMMU to on even when you have less than 4GB of
-	  memory and add debugging code. On overflow always panic. And
-	  allow to enable IOMMU leak tracing. Can be disabled at boot
-	  time with iommu=noforce. This will also enable scatter gather
-	  list merging.  Currently not recommended for production
-	  code. When you use it make sure you have a big enough
-	  IOMMU/AGP aperture.  Most of the options enabled by this can
-	  be set more finegrained using the iommu= command line
-	  options. See Documentation/x86_64/boot-options.txt for more
-	  details.
-
-config IOMMU_LEAK
-	bool "IOMMU leak tracing"
-	depends on DEBUG_KERNEL
-	depends on IOMMU_DEBUG
-	help
-	  Add a simple leak tracer to the IOMMU code. This is useful when you
-	  are debugging a buggy device driver that leaks IOMMU mappings.
-
-#config X86_REMOTE_DEBUG
-#	bool "kgdb debugging stub"
+          This option allows trapping of rare doublefault exceptions that
+          would otherwise cause a system to silently reboot. Disabling this
+          option saves about 4k and might cause you much additional grey
+          hair.
 
 endmenu

trunk/arch/x86/Makefile_32 → trunk/arch/i386/Makefile

@@ -1,5 +1,5 @@
 #
-# i386 Makefile
+# i386/Makefile
 #
 # This file is included by the global makefile so that you can add your own
 # architecture-specific flags and dependencies. Remember to do have actions
@@ -17,6 +17,9 @@
 # 20050320  Kianusch Sayah Karadji <kianusch@sk-tech.net>
 #           Added support for GEODE CPU
 
+# Fill in SRCARCH
+SRCARCH	:= x86
+
 # BITS is used as extension for files which are available in a 32 bit
 # and a 64 bit version to simplify shared Makefiles.
 # e.g.: obj-y += foo_$(BITS).o
@@ -43,7 +46,7 @@ KBUILD_CFLAGS += -pipe -msoft-float -mregparm=3 -freg-struct-return
 KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2)
 
 # CPU-specific tuning. Anything which can be shared with UML should go here.
-include $(srctree)/arch/x86/Makefile_32.cpu
+include $(srctree)/arch/i386/Makefile.cpu
 
 # temporary until string.h is fixed
 cflags-y += -ffreestanding

trunk/arch/x86/boot/boot.h

@@ -17,8 +17,6 @@
 #ifndef BOOT_BOOT_H
 #define BOOT_BOOT_H
 
-#define STACK_SIZE	512	/* Minimum number of bytes for stack */
-
 #ifndef __ASSEMBLY__
 
 #include <stdarg.h>
@@ -200,6 +198,8 @@ static inline int isdigit(int ch)
 }
 
 /* Heap -- available for dynamic lists. */
+#define STACK_SIZE	512	/* Minimum number of bytes for stack */
+
 extern char _end[];
 extern char *HEAP;
 extern char *heap_end;
@@ -216,9 +216,9 @@ static inline char *__get_heap(size_t s, size_t a, size_t n)
 #define GET_HEAP(type, n) \
 	((type *)__get_heap(sizeof(type),__alignof__(type),(n)))
 
-static inline bool heap_free(size_t n)
+static inline int heap_free(void)
 {
-	return (int)(heap_end-HEAP) >= (int)n;
+	return heap_end-HEAP;
 }
 
 /* copy.S */

trunk/arch/x86/boot/header.S

@@ -173,8 +173,7 @@ ramdisk_size:	.long	0		# its size in bytes
 bootsect_kludge:
 		.long	0		# obsolete
 
-heap_end_ptr:	.word	_end+STACK_SIZE-512
-					# (Header version 0x0201 or later)
+heap_end_ptr:	.word	_end+1024	# (Header version 0x0201 or later)
 					# space from here (exclusive) down to
 					# end of setup code can be used by setup
 					# for local heap purposes.
@@ -231,53 +230,28 @@ start_of_setup:
 	int	$0x13
 #endif
 
+# We will have entered with %cs = %ds+0x20, normalize %cs so
+# it is on par with the other segments.
+	pushw	%ds
+	pushw	$setup2
+	lretw
+
+setup2:
 # Force %es = %ds
 	movw	%ds, %ax
 	movw	%ax, %es
 	cld
 
-# Apparently some ancient versions of LILO invoked the kernel
-# with %ss != %ds, which happened to work by accident for the
-# old code.  If the CAN_USE_HEAP flag is set in loadflags, or
-# %ss != %ds, then adjust the stack pointer.
-
-	# Smallest possible stack we can tolerate
-	movw	$(_end+STACK_SIZE), %cx
-
-	movw	heap_end_ptr, %dx
-	addw	$512, %dx
-	jnc	1f
-	xorw	%dx, %dx	# Wraparound - whole segment available
-1:	testb	$CAN_USE_HEAP, loadflags
-	jnz	2f
-
-	# No CAN_USE_HEAP
-	movw	%ss, %dx
-	cmpw	%ax, %dx	# %ds == %ss?
-	movw	%sp, %dx
-	# If so, assume %sp is reasonably set, otherwise use
-	# the smallest possible stack.
-	jne	4f		# -> Smallest possible stack...
-
-	# Make sure the stack is at least minimum size.  Take a value
-	# of zero to mean "full segment."
-2:
-	andw	$~3, %dx	# dword align (might as well...)
-	jnz	3f
-	movw	$0xfffc, %dx	# Make sure we're not zero
-3:	cmpw	%cx, %dx
-	jnb	5f
-4:	movw	%cx, %dx	# Minimum value we can possibly use
-5:	movw	%ax, %ss
-	movzwl	%dx, %esp	# Clear upper half of %esp
-	sti			# Now we should have a working stack
-
-# We will have entered with %cs = %ds+0x20, normalize %cs so
-# it is on par with the other segments.
-	pushw	%ds
-	pushw	$6f
-	lretw
-6:
+# Stack paranoia: align the stack and make sure it is good
+# for both 16- and 32-bit references.  In particular, if we
+# were meant to have been using the full 16-bit segment, the
+# caller might have set %sp to zero, which breaks %esp-based
+# references.
+	andw	$~3, %sp	# dword align (might as well...)
+	jnz	1f
+	movw	$0xfffc, %sp	# Make sure we're not zero
+1:	movzwl	%sp, %esp	# Clear upper half of %esp
+	sti
 
 # Check signature at end of setup
 	cmpl	$0x5a5aaa55, setup_sig

trunk/arch/x86/boot/video-bios.c

@@ -79,7 +79,7 @@ static int bios_probe(void)
 	video_bios.modes = GET_HEAP(struct mode_info, 0);
 
 	for (mode = 0x14; mode <= 0x7f; mode++) {
-		if (!heap_free(sizeof(struct mode_info)))
+		if (heap_free() < sizeof(struct mode_info))
 			break;
 
 		if (mode_defined(VIDEO_FIRST_BIOS+mode))

trunk/arch/x86/boot/video-vesa.c

@@ -57,7 +57,7 @@ static int vesa_probe(void)
 	while ((mode = rdfs16(mode_ptr)) != 0xffff) {
 		mode_ptr += 2;
 
-		if (!heap_free(sizeof(struct mode_info)))
+		if (heap_free() < sizeof(struct mode_info))
 			break;	/* Heap full, can't save mode info */
 
 		if (mode & ~0x1ff)

trunk/arch/x86/boot/video.c

@@ -371,7 +371,7 @@ static void save_screen(void)
 	saved.curx = boot_params.screen_info.orig_x;
 	saved.cury = boot_params.screen_info.orig_y;
 
-	if (!heap_free(saved.x*saved.y*sizeof(u16)+512))
+	if (heap_free() < saved.x*saved.y*sizeof(u16)+512)
 		return;		/* Not enough heap to save the screen */
 
 	saved.data = GET_HEAP(u16, saved.x*saved.y);

trunk/arch/x86_64/.gitignore

@@ -0,0 +1 @@
+boot

trunk/arch/x86/Kconfig.x86_64 → trunk/arch/x86_64/Kconfig

@@ -835,7 +835,7 @@ source fs/Kconfig
 
 source "kernel/Kconfig.instrumentation"
 
-source "arch/x86/Kconfig.debug"
+source "arch/x86_64/Kconfig.debug"
 
 source "security/Kconfig"