Update of /cvsroot/linuxconsole/ruby/linux/arch/alpha/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv30742
Modified Files:
setup.c
Log Message:
Synced up to 2.5.45
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/alpha/kernel/setup.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- setup.c 18 Jun 2002 18:51:54 -0000 1.10
+++ setup.c 1 Nov 2002 23:12:36 -0000 1.11
@@ -37,6 +37,11 @@
#include <linux/blk.h>
#endif
+#ifdef CONFIG_MAGIC_SYSRQ
+#include <linux/sysrq.h>
+#include <linux/reboot.h>
+#endif
+
#include <linux/notifier.h>
extern struct notifier_block *panic_notifier_list;
static int alpha_panic_event(struct notifier_block *, unsigned long, void *);
@@ -89,6 +94,8 @@
int alpha_using_srm;
#endif
+unsigned char aux_device_present = 0xaa;
+
#define N(a) (sizeof(a)/sizeof(a[0]))
static struct alpha_machine_vector *get_sysvec(long, long, long);
@@ -105,12 +112,12 @@
*/
struct screen_info screen_info = {
- orig_x: 0,
- orig_y: 25,
- orig_video_cols: 80,
- orig_video_lines: 25,
- orig_video_isVGA: 1,
- orig_video_points: 16
+ .orig_x = 0,
+ .orig_y = 25,
+ .orig_video_cols = 80,
+ .orig_video_lines = 25,
+ .orig_video_isVGA = 1,
+ .orig_video_points = 16
};
/*
@@ -445,12 +452,12 @@
}
static struct console srmcons = {
- name: "srm0",
- write: srm_console_write,
- device: srm_console_device,
- setup: srm_console_setup,
- flags: CON_PRINTBUFFER | CON_ENABLED, /* fake it out */
- index: -1,
+ .name = "srm0",
+ .write = srm_console_write,
+ .device = srm_console_device,
+ .setup = srm_console_setup,
+ .flags = CON_PRINTBUFFER | CON_ENABLED, /* fake it out */
+ .index = -1,
};
#else
@@ -537,6 +544,15 @@
register_srm_console();
}
+#ifdef CONFIG_MAGIC_SYSRQ
+ /* If we're using SRM, make sysrq-b halt back to the prom,
+ not auto-reboot. */
+ if (alpha_using_srm) {
+ struct sysrq_key_op *op = __sysrq_get_key_op('b');
+ op->handler = (void *) machine_halt;
+ }
+#endif
+
/*
* Indentify and reconfigure for the current system.
*/
@@ -1094,7 +1110,7 @@
#ifdef CONFIG_SMP
seq_printf(f, "cpus active\t\t: %d\n"
"cpu active mask\t\t: %016lx\n",
- smp_num_cpus, cpu_present_mask);
+ num_online_cpus(), cpu_present_mask);
#endif
return 0;
@@ -1121,10 +1137,10 @@
}
struct seq_operations cpuinfo_op = {
- start: c_start,
- next: c_next,
- stop: c_stop,
- show: show_cpuinfo,
+ .start = c_start,
+ .next = c_next,
+ .stop = c_stop,
+ .show = show_cpuinfo,
};
|
