patch-2.4.25 linux-2.4.25/drivers/pcmcia/rsrc_mgr.c
Next file: linux-2.4.25/drivers/pcmcia/sa1100_stork.c
Previous file: linux-2.4.25/drivers/pcmcia/cs.c
Back to the patch index
Back to the overall index
- Lines: 34
- Date:
2004-02-18 05:36:31.000000000 -0800
- Orig file:
linux-2.4.24/drivers/pcmcia/rsrc_mgr.c
- Orig date:
2003-08-25 04:44:42.000000000 -0700
diff -urN linux-2.4.24/drivers/pcmcia/rsrc_mgr.c linux-2.4.25/drivers/pcmcia/rsrc_mgr.c
@@ -379,7 +379,7 @@
void validate_mem(int (*is_valid)(u_long), int (*do_cksum)(u_long),
int force_low, socket_info_t *s)
{
- resource_map_t *m, *n;
+ resource_map_t *m, mm;
static u_char order[] = { 0xd0, 0xe0, 0xc0, 0xf0 };
static int hi = 0, lo = 0;
u_long b, i, ok = 0;
@@ -393,18 +393,18 @@
"available!\n");
}
if (lo++) return;
- for (m = mem_db.next; m != &mem_db; m = n) {
- n = m->next;
+ for (m = mem_db.next; m != &mem_db; m = mm.next) {
+ mm = *m;
/* Only probe < 1 MB */
- if (m->base >= 0x100000) continue;
- if ((m->base | m->num) & 0xffff) {
- ok += do_mem_probe(m->base, m->num, is_valid, do_cksum, s);
+ if (mm.base >= 0x100000) continue;
+ if ((mm.base | mm.num) & 0xffff) {
+ ok += do_mem_probe(mm.base, mm.num, is_valid, do_cksum, s);
continue;
}
/* Special probe for 64K-aligned block */
for (i = 0; i < 4; i++) {
b = order[i] << 12;
- if ((b >= m->base) && (b+0x10000 <= m->base+m->num)) {
+ if ((b >= mm.base) && (b+0x10000 <= mm.base+mm.num)) {
if (ok >= mem_limit)
sub_interval(&mem_db, b, 0x10000);
else
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)