diff options
| author | Neil Brown <neilb@cse.unsw.edu.au> | 2002-05-17 22:03:19 -0700 |
|---|---|---|
| committer | Christoph Hellwig <hch@sb.bsdonline.org> | 2002-05-17 22:03:19 -0700 |
| commit | 7d684b93efe0a64d557223a89429501b9c4e5c90 (patch) | |
| tree | 5c6f90fbe056a4e99415c721e3db1f6bf9bf3b42 /include | |
| parent | bd415ca2e54b2b305aa4b3a9bec2bf67c3bedcbf (diff) | |
[PATCH] Tidy up raid5 code
- remove md_ prefix from some calls that used to be
defined in md_compatability.h
- remove "raid5_" prefix from some static functions,
in line with recent changes to raid1.c
?? should cpu_has_mmx be moved to in processor.h ?
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/xor.h | 4 | ||||
| -rw-r--r-- | include/linux/raid/raid5.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-i386/xor.h b/include/asm-i386/xor.h index 3130e8212c11..1e90675975e1 100644 --- a/include/asm-i386/xor.h +++ b/include/asm-i386/xor.h @@ -839,6 +839,8 @@ static struct xor_block_template xor_block_pIII_sse = { /* Also try the generic routines. */ #include <asm-generic/xor.h> +#define cpu_has_mmx (test_bit(X86_FEATURE_MMX, boot_cpu_data.x86_capability)) + #undef XOR_TRY_TEMPLATES #define XOR_TRY_TEMPLATES \ do { \ @@ -846,7 +848,7 @@ static struct xor_block_template xor_block_pIII_sse = { xor_speed(&xor_block_32regs); \ if (cpu_has_xmm) \ xor_speed(&xor_block_pIII_sse); \ - if (md_cpu_has_mmx()) { \ + if (cpu_has_mmx) { \ xor_speed(&xor_block_pII_mmx); \ xor_speed(&xor_block_p5_mmx); \ } \ diff --git a/include/linux/raid/raid5.h b/include/linux/raid/raid5.h index 5b4a005e3403..d3485daeb0f1 100644 --- a/include/linux/raid/raid5.h +++ b/include/linux/raid/raid5.h @@ -215,11 +215,11 @@ struct raid5_private_data { */ atomic_t active_stripes; struct list_head inactive_list; - md_wait_queue_head_t wait_for_stripe; + wait_queue_head_t wait_for_stripe; int inactive_blocked; /* release of inactive stripes blocked, * waiting for 25% to be free */ - md_spinlock_t device_lock; + spinlock_t device_lock; int plugged; struct tq_struct plug_tq; |