patch-1.3.15 linux/arch/i386/kernel/setup.c
Next file: linux/arch/i386/kernel/traps.c
Previous file: linux/arch/i386/kernel/bios32.c
Back to the patch index
Back to the overall index
- Lines: 18
- Date:
Tue Aug 1 10:02:30 1995
- Orig file:
v1.3.14/linux/arch/i386/kernel/setup.c
- Orig date:
Thu Jun 29 19:02:39 1995
diff -u --recursive --new-file v1.3.14/linux/arch/i386/kernel/setup.c linux/arch/i386/kernel/setup.c
@@ -103,7 +103,7 @@
init_task.mm->brk = TASK_SIZE + (unsigned long) &_end;
for (;;) {
- if (c == ' ' && *(unsigned long *)from == *(unsigned long *)"mem=") {
+ if (c == ' ' && *(const unsigned long *)from == *(const unsigned long *)"mem=") {
memory_end = simple_strtoul(from+4, &from, 0);
if ( *from == 'K' || *from == 'k' ) {
memory_end = memory_end << 10;
@@ -136,7 +136,7 @@
int get_cpuinfo(char * buffer)
{
- char *model[2][9]={{"DX","SX","DX/2","4","SX/2","6",
+ static const char *model[2][9]={{"DX","SX","DX/2","4","SX/2","6",
"DX/2-WB","DX/4"},
{"Pentium 60/66","Pentium 90/100","3",
"4","5","6","7","8"}};
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov
with Sam's (original) version of this