Update of /cvsroot/linux-mips/linux/include/asm-mips64
In directory usw-pr-cvs1:/tmp/cvs-serv5739/include/asm-mips64
Modified Files:
io.h module.h
Log Message:
Sync with OSS 2.4.9.
Index: io.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/io.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- io.h 2001/09/04 16:15:50 1.4
+++ io.h 2001/09/25 03:36:36 1.5
@@ -30,6 +30,11 @@
#undef CONF_SLOWDOWN_IO
/*
+ * Change "struct page" to physical address.
+ */
+#define page_to_phys(page) PHYSADDR(page_address(page))
+
+/*
* On MIPS, we have the whole physical address space mapped at all
* times, so "ioremap()" and "iounmap()" do not need to do anything.
*
@@ -111,6 +116,9 @@
{
return (void *)(address + PAGE_OFFSET);
}
+
+/* This is too simpleminded for more sophisticated than dumb hardware ... */
+#define page_to_bus page_to_phys
/*
* isa_slot_offset is the address where E(ISA) busaddress 0 is mapped
Index: module.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/module.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- module.h 2001/08/21 17:21:39 1.1
+++ module.h 2001/09/25 03:36:36 1.2
@@ -26,9 +26,12 @@
{
struct archdata *archdata;
- if (!mod_member_present(mod, archdata_start) || !mod->archdata_start)
+ if (!mod_member_present(mod, archdata_end))
return 0;
+
archdata = (struct archdata *)(mod->archdata_start);
+ if (!mod_archdata_member_present(mod, struct archdata, dbe_table_end))
+ return 0;
if (archdata->dbe_table_start > archdata->dbe_table_end ||
(archdata->dbe_table_start &&
@@ -40,7 +43,7 @@
(unsigned long)archdata->dbe_table_end) %
sizeof(struct exception_table_entry))) {
printk(KERN_ERR
- "arch_init_module: archdata->dbe_table_* invalid.\n");
+ "module_arch_init: archdata->dbe_table_* invalid.\n");
return 1;
}
|
