diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
| commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
| tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /arch/i386/boot/compressed | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'arch/i386/boot/compressed')
| -rw-r--r-- | arch/i386/boot/compressed/Makefile | 2 | ||||
| -rw-r--r-- | arch/i386/boot/compressed/head.S | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/boot/compressed/Makefile b/arch/i386/boot/compressed/Makefile index 83a245add..6e4b4998d 100644 --- a/arch/i386/boot/compressed/Makefile +++ b/arch/i386/boot/compressed/Makefile @@ -9,7 +9,7 @@ SYSTEM = $(TOPDIR)/vmlinux OBJECTS = $(HEAD) misc.o -CFLAGS = -O2 -DSTDC_HEADERS +CFLAGS = $(CPPFLAGS) -O2 -DSTDC_HEADERS ZLDFLAGS = -e startup_32 # diff --git a/arch/i386/boot/compressed/head.S b/arch/i386/boot/compressed/head.S index 0aa8ddc44..eb2a9a2c5 100644 --- a/arch/i386/boot/compressed/head.S +++ b/arch/i386/boot/compressed/head.S @@ -53,9 +53,9 @@ startup_32: xorl %eax,%eax # Back to 0 mov %cx,%ax # SP low 16 bits movl %eax,%esp - pushl 0 # Clear NT + pushl $0 # Clear NT popfl - ljmp $(__KERNEL_CS), $0x100000 # Into C and sanity + ljmp $(__KERNEL_CS), $0x100000 # Into C and sanity 2: #endif |