diff options
| author | Ingo Molnar <mingo@elte.hu> | 2002-07-21 23:44:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-07-21 23:44:38 -0700 |
| commit | f1594c9c1ae6a3e94f2c1de398bca093ee62aab2 (patch) | |
| tree | 9eb4def718cb7b51128c537009ba96b192807960 /include/linux | |
| parent | 7ee2f6c993a829cc24cce819261bc2b6053348cc (diff) | |
[PATCH] Re: [patch] cli()/sti() cleanup
Make people use the proper cli/sti replacements
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/bio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index 1b4004652cde..fee72762ad8d 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -215,7 +215,7 @@ extern inline char *bio_kmap_irq(struct bio *bio, unsigned long *flags) { unsigned long addr; - __save_flags(*flags); + local_save_flags(*flags); /* * could be low @@ -226,7 +226,7 @@ extern inline char *bio_kmap_irq(struct bio *bio, unsigned long *flags) /* * it's a highmem page */ - __cli(); + local_irq_disable(); addr = (unsigned long) kmap_atomic(bio_page(bio), KM_BIO_SRC_IRQ); if (addr & ~PAGE_MASK) @@ -240,7 +240,7 @@ extern inline void bio_kunmap_irq(char *buffer, unsigned long *flags) unsigned long ptr = (unsigned long) buffer & PAGE_MASK; kunmap_atomic((void *) ptr, KM_BIO_SRC_IRQ); - __restore_flags(*flags); + local_irq_restore(*flags); } #else |