diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 12:37:17 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 12:37:17 +0000 |
| commit | 9aa9eb41942b918f385ccabd2efdd6e7e4232165 (patch) | |
| tree | 20bec7da036d31ec185dfc1dcc00753c7ac9b170 /arch/i386 | |
| parent | 87075e049581f880f01eb0b41aa6ac807b299e35 (diff) | |
Merge with Linux 2.4.0-test6-pre1.
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/Makefile | 2 | ||||
| -rw-r--r-- | arch/i386/boot/compressed/misc.c | 1 | ||||
| -rw-r--r-- | arch/i386/config.in | 2 | ||||
| -rw-r--r-- | arch/i386/defconfig | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/microcode.c | 3 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/i386/Makefile b/arch/i386/Makefile index b63dcb89e..4087e089b 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile @@ -58,7 +58,7 @@ CFLAGS += $(shell if $(CC) -march=k6 -S -o /dev/null -xc /dev/null >/dev/null 2> endif ifdef CONFIG_MK7 -CFLAGS += $(shell if $(CC) -march=i686 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=i686"; fi) -malign-functions=4 -fschedule-insns2 -mwide-multiply -fexpensive-optimizations +CFLAGS += $(shell if $(CC) -march=athlon -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=athlon"; else if $(CC) -march=i686 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=i686 -malign-functions=4"; fi fi) endif ifdef CONFIG_MCRUSOE diff --git a/arch/i386/boot/compressed/misc.c b/arch/i386/boot/compressed/misc.c index 15d6e4f6a..abb382d8f 100644 --- a/arch/i386/boot/compressed/misc.c +++ b/arch/i386/boot/compressed/misc.c @@ -298,6 +298,7 @@ void setup_normal_output_buffer(void) if ((ALT_MEM_K > EXT_MEM_K ? ALT_MEM_K : EXT_MEM_K) < 1024) error("Less than 2MB of memory.\n"); #endif output_data = (char *)0x100000; /* Points to 1M */ + free_mem_end_ptr = (long)real_mode; } struct moveparams { diff --git a/arch/i386/config.in b/arch/i386/config.in index d9fcd91db..5f6ae670d 100644 --- a/arch/i386/config.in +++ b/arch/i386/config.in @@ -344,5 +344,5 @@ mainmenu_option next_comment comment 'Kernel hacking' #bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC -bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ +dep_bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ $CONFIG_VT endmenu diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 1055ed5e3..4ead92e81 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig @@ -478,13 +478,13 @@ CONFIG_PSMOUSE=y # Ftape, the floppy tape device driver # # CONFIG_FTAPE is not set +# CONFIG_AGP is not set CONFIG_DRM=y CONFIG_DRM_TDFX=y # CONFIG_DRM_GAMMA is not set # CONFIG_DRM_R128 is not set # CONFIG_DRM_I810 is not set # CONFIG_DRM_MGA is not set -# CONFIG_AGP is not set CONFIG_PCMCIA_SERIAL=y # diff --git a/arch/i386/kernel/microcode.c b/arch/i386/kernel/microcode.c index 0519aee0c..c02385e79 100644 --- a/arch/i386/kernel/microcode.c +++ b/arch/i386/kernel/microcode.c @@ -145,11 +145,10 @@ static int microcode_open(struct inode *inode, struct file *file) return 0; } +/* our specific f_op->release() method needs no locking */ static int microcode_release(struct inode *inode, struct file *file) { - lock_kernel(); clear_bit(MICROCODE_IS_OPEN, µcode_status); - unlock_kernel(); return 0; } |