Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 30182
b: refs/heads/master
c: a7addce
h: refs/heads/master
v: v3
  • Loading branch information
Akinobu Mita authored and Linus Torvalds committed Jun 26, 2006
1 parent 5eec520 commit 693c5e0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8e13059a37252c45ab7173a0e4bac05e4a444ab6
refs/heads/master: a7addcea6ac7c0e9733a48cda06ca0880f116a48
6 changes: 2 additions & 4 deletions trunk/arch/i386/pci/pcbios.c
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,7 @@ void __devinit pcibios_sort(void)
list_for_each(ln, &pci_devices) {
d = pci_dev_g(ln);
if (d->bus->number == bus && d->devfn == devfn) {
list_del(&d->global_list);
list_add_tail(&d->global_list, &sorted_devices);
list_move_tail(&d->global_list, &sorted_devices);
if (d == dev)
found = 1;
break;
Expand All @@ -390,8 +389,7 @@ void __devinit pcibios_sort(void)
if (!found) {
printk(KERN_WARNING "PCI: Device %s not found by BIOS\n",
pci_name(dev));
list_del(&dev->global_list);
list_add_tail(&dev->global_list, &sorted_devices);
list_move_tail(&dev->global_list, &sorted_devices);
}
}
list_splice(&sorted_devices, &pci_devices);
Expand Down
6 changes: 2 additions & 4 deletions trunk/arch/m68k/mm/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ pmd_t *get_pointer_table (void)
PD_MARKBITS(dp) = mask & ~tmp;
if (!PD_MARKBITS(dp)) {
/* move to end of list */
list_del(dp);
list_add_tail(dp, &ptable_list);
list_move_tail(dp, &ptable_list);
}
return (pmd_t *) (page_address(PD_PAGE(dp)) + off);
}
Expand Down Expand Up @@ -123,8 +122,7 @@ int free_pointer_table (pmd_t *ptable)
* move this descriptor to the front of the list, since
* it has one or more free tables.
*/
list_del(dp);
list_add(dp, &ptable_list);
list_move(dp, &ptable_list);
}
return 0;
}
Expand Down
6 changes: 2 additions & 4 deletions trunk/arch/m68k/sun3/sun3dvma.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ static inline int refill(void)
if(hole->end == prev->start) {
hole->size += prev->size;
hole->end = prev->end;
list_del(&(prev->list));
list_add(&(prev->list), &hole_cache);
list_move(&(prev->list), &hole_cache);
ret++;
}

Expand Down Expand Up @@ -182,8 +181,7 @@ static inline unsigned long get_baddr(int len, unsigned long align)
#endif
return hole->end;
} else if(hole->size == newlen) {
list_del(&(hole->list));
list_add(&(hole->list), &hole_cache);
list_move(&(hole->list), &hole_cache);
dvma_entry_use(hole->start) = newlen;
#ifdef DVMA_DEBUG
dvma_allocs++;
Expand Down

0 comments on commit 693c5e0

Please sign in to comment.