Merge with Linux 2.3.50.

6 files changed, 16 insertions, 9 deletions

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 4ba71ba06..2a84bf05f 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -21,12 +21,10 @@ OBJCOPY=$(CROSS_COMPILE)objcopy -O binary -R .note -R .comment -S
 LDFLAGS=-e stext
 LINKFLAGS =-T $(TOPDIR)/arch/i386/vmlinux.lds $(LDFLAGS)
 
-CFLAGS_PIPE := -pipe
+CFLAGS += -pipe
 
 # only work around strength reduction bug(s) on older gcc versions
-CFLAGS_NSR  := $(shell if $(CC) -march=i486 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo ""; else echo "-fno-strength-reduce"; fi)
-
-CFLAGS := $(CFLAGS) $(CFLAGS_PIPE) $(CFLAGS_NSR)
+CFLAGS += $(shell if ! $(CC) -march=i486 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-fno-strength-reduce"; fi)
 
 # prevent gcc from keeping the stack 16 byte aligned
 CFLAGS += $(shell if $(CC) -mpreferred-stack-boundary=2 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mpreferred-stack-boundary=2"; fi)
diff --git a/arch/i386/boot/compressed/Makefile b/arch/i386/boot/compressed/Makefile
index 6e4b4998d..b4b7de133 100644
--- a/arch/i386/boot/compressed/Makefile
+++ b/arch/i386/boot/compressed/Makefile
@@ -33,6 +33,9 @@ bvmlinux: piggy.o $(OBJECTS)
 head.o: head.S
 	$(CC) $(AFLAGS) -traditional -c head.S
 
+misc.o: misc.c
+	$(CC) $(CFLAGS) -c misc.c
+
 piggy.o:	$(SYSTEM)
 	tmppiggy=_tmp_$$$$piggy; \
 	rm -f $$tmppiggy $$tmppiggy.gz $$tmppiggy.lnk; \
diff --git a/arch/i386/config.in b/arch/i386/config.in
index 1d5c0d5f7..11a98fc58 100644
--- a/arch/i386/config.in
+++ b/arch/i386/config.in
@@ -47,6 +47,7 @@ if [ "$CONFIG_MK7" = "y" ]; then
    define_bool CONFIG_X86_TSC y
    define_bool CONFIG_X86_GOOD_APIC y
    define_bool CONFIG_X86_USE_3DNOW y
+   define_bool CONFIG_X86_PGE y
 fi
 
 if [ "$CONFIG_DEVFS_FS" = "y" ]; then
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index f2517c27d..aa04c3685 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -76,6 +76,10 @@ CONFIG_BINFMT_MISC=y
 CONFIG_PM=y
 CONFIG_ACPI=y
 # CONFIG_APM is not set
+
+#
+# Parallel port support
+#
 # CONFIG_PARPORT is not set
 
 #
@@ -282,6 +286,7 @@ CONFIG_NET_ETHERNET=y
 CONFIG_NET_PCI=y
 # CONFIG_PCNET32 is not set
 # CONFIG_APRICOT is not set
+# CONFIG_CS89x0 is not set
 # CONFIG_DE4X5 is not set
 # CONFIG_TULIP is not set
 # CONFIG_DGRS is not set
@@ -308,7 +313,7 @@ CONFIG_EEPRO100=y
 # CONFIG_NET_RADIO is not set
 
 #
-# Token Ring driver support
+# Token Ring devices
 #
 # CONFIG_TR is not set
 # CONFIG_NET_FC is not set
diff --git a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c
index 4163626f4..120c861e7 100644
--- a/arch/i386/kernel/irq.c
+++ b/arch/i386/kernel/irq.c
@@ -199,13 +199,13 @@ static void show(char * str)
 		printk(" %d",local_bh_count(i));
 
 	printk(" ]\nStack dumps:");
-	for(i=0;i< smp_num_cpus;i++) {
+	for(i = 0; i < smp_num_cpus; i++) {
 		unsigned long esp;
-		if(i==cpu)
+		if (i == cpu)
 			continue;
 		printk("\nCPU %d:",i);
 		esp = init_tss[i].esp0;
-		if(esp==NULL) {
+		if (!esp) {
 			/* tss->esp0 is set to NULL in cpu_init(),
 			 * it's initialized when the cpu returns to user
 			 * space. -- manfreds
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index b9e535a71..c801285eb 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -320,7 +320,7 @@ static void __init pagetable_init(void)
 		if (vaddr >= end)
 			break;
 #if CONFIG_X86_PAE
-		pmd = (pmd_t *) alloc_bootmem_pages(PAGE_SIZE);
+		pmd = (pmd_t *) alloc_bootmem_low_pages(PAGE_SIZE);
 		set_pgd(pgd, __pgd(__pa(pmd) + 0x1));
 #else
 		pmd = (pmd_t *)pgd;