patch-2.4.21 linux-2.4.21/arch/sparc/mm/sun4c.c
Next file: linux-2.4.21/arch/sparc/prom/misc.c
Previous file: linux-2.4.21/arch/sparc/mm/srmmu.c
Back to the patch index
Back to the overall index
- Lines: 61
- Date:
2003-06-13 07:51:32.000000000 -0700
- Orig file:
linux-2.4.20/arch/sparc/mm/sun4c.c
- Orig date:
2002-11-28 15:53:12.000000000 -0800
diff -urN linux-2.4.20/arch/sparc/mm/sun4c.c linux-2.4.21/arch/sparc/mm/sun4c.c
@@ -246,7 +246,7 @@
_unused = sun4c_get_context();
sun4c_set_context(_unused);
#ifdef CONFIG_SUN_AUXIO
- _unused = *AUXREG;
+ _unused = get_auxio();
#endif
}
@@ -290,7 +290,7 @@
switch (idprom->id_machtype) {
case (SM_SUN4|SM_4_110):
- sun4c_vacinfo.type = NONE;
+ sun4c_vacinfo.type = VAC_NONE;
sun4c_vacinfo.num_bytes = 0;
sun4c_vacinfo.linesize = 0;
sun4c_vacinfo.do_hwflushes = 0;
@@ -299,21 +299,21 @@
break;
case (SM_SUN4|SM_4_260):
- sun4c_vacinfo.type = WRITE_BACK;
+ sun4c_vacinfo.type = VAC_WRITE_BACK;
sun4c_vacinfo.num_bytes = 128 * 1024;
sun4c_vacinfo.linesize = 16;
sun4c_vacinfo.do_hwflushes = 0;
break;
case (SM_SUN4|SM_4_330):
- sun4c_vacinfo.type = WRITE_THROUGH;
+ sun4c_vacinfo.type = VAC_WRITE_THROUGH;
sun4c_vacinfo.num_bytes = 128 * 1024;
sun4c_vacinfo.linesize = 16;
sun4c_vacinfo.do_hwflushes = 0;
break;
case (SM_SUN4|SM_4_470):
- sun4c_vacinfo.type = WRITE_BACK;
+ sun4c_vacinfo.type = VAC_WRITE_BACK;
sun4c_vacinfo.num_bytes = 128 * 1024;
sun4c_vacinfo.linesize = 32;
sun4c_vacinfo.do_hwflushes = 0;
@@ -324,7 +324,7 @@
prom_halt();
};
} else {
- sun4c_vacinfo.type = WRITE_THROUGH;
+ sun4c_vacinfo.type = VAC_WRITE_THROUGH;
if ((idprom->id_machtype == (SM_SUN4C | SM_4C_SS1)) ||
(idprom->id_machtype == (SM_SUN4C | SM_4C_SS1PLUS))) {
@@ -386,7 +386,7 @@
daddr = &(dst); \
iaddr = &(src); \
*daddr = *iaddr; \
- } while (0);
+ } while (0)
static void __init patch_kernel_fault_handler(void)
{
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)