Update of /cvsroot/linuxconsole/ruby/linux/arch/x86_64/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv13236/linux/arch/x86_64/kernel
Modified Files:
setup.c
Log Message:
Synced to 2.5.22
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/x86_64/kernel/setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.c 24 Apr 2002 18:56:51 -0000 1.2
+++ setup.c 18 Jun 2002 18:51:54 -0000 1.3
@@ -28,7 +28,6 @@
#include <linux/delay.h>
#include <linux/config.h>
#include <linux/init.h>
-#include <linux/apm_bios.h>
#ifdef CONFIG_BLK_DEV_RAM
#include <linux/blk.h>
#endif
@@ -37,6 +36,7 @@
#include <asm/processor.h>
#include <linux/console.h>
#include <linux/seq_file.h>
+#include <linux/root_dev.h>
#include <asm/mtrr.h>
#include <asm/uaccess.h>
#include <asm/system.h>
@@ -65,6 +65,8 @@
/* For PCI or other memory-mapped resources */
unsigned long pci_mem_start = 0x10000000;
+unsigned long saved_video_mode;
+
/*
* Setup options
*/
@@ -77,6 +79,8 @@
struct e820map e820;
+unsigned char aux_device_present;
+
extern int root_mountflags;
extern char _text, _etext, _edata, _end;
@@ -543,14 +547,18 @@
unsigned long start_pfn, end_pfn;
+extern void exception_table_check(void);
+
void __init setup_arch(char **cmdline_p)
{
unsigned long bootmap_size, low_mem_size;
int i;
- ROOT_DEV = to_kdev_t(ORIG_ROOT_DEV);
+ ROOT_DEV = ORIG_ROOT_DEV;
drive_info = DRIVE_INFO;
screen_info = SCREEN_INFO;
+ aux_device_present = AUX_DEVICE_INFO;
+ saved_video_mode = SAVED_VIDEO_MODE;
#ifdef CONFIG_BLK_DEV_RAM
rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK;
@@ -771,6 +779,7 @@
low_mem_size = ((max_low_pfn << PAGE_SHIFT) + 0xfffff) & ~0xfffff;
if (low_mem_size > pci_mem_start)
pci_mem_start = low_mem_size;
+ exception_table_check();
}
#ifndef CONFIG_X86_TSC
@@ -1081,7 +1090,7 @@
else
seq_printf(m, "stepping\t: unknown\n");
- if ( test_bit(X86_FEATURE_TSC, &c->x86_capability) ) {
+ if (cpu_has(c,X86_FEATURE_TSC)) {
seq_printf(m, "cpu MHz\t\t: %u.%03u\n",
cpu_khz / 1000, (cpu_khz % 1000));
}
|
