diff options
author | Dan Williams <dan.j.williams@intel.com> | 2007-07-09 14:56:42 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2007-07-13 11:06:14 -0400 |
commit | 685784aaf3cd0e3ff5e36c7ecf6f441cdbf57f73 (patch) | |
tree | 10f99829f7d877b87614fe69be77e363c026a8d7 /drivers/md/Makefile | |
parent | d379b01e9087a582d58f4b678208a4f8d8376fe7 (diff) |
xor: make 'xor_blocks' a library routine for use with async_tx
The async_tx api tries to use a dma engine for an operation, but will fall
back to an optimized software routine otherwise. Xor support is
implemented using the raid5 xor routines. For organizational purposes this
routine is moved to a common area.
The following fixes are also made:
* rename xor_block => xor_blocks, suggested by Adrian Bunk
* ensure that xor.o initializes before md.o in the built-in case
* checkpatch.pl fixes
* mark calibrate_xor_blocks __init, Adrian Bunk
Cc: Adrian Bunk <bunk@stusta.de>
Cc: NeilBrown <neilb@suse.de>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/md/Makefile')
-rw-r--r-- | drivers/md/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/Makefile b/drivers/md/Makefile index 38754084eac..71eb45f7417 100644 --- a/drivers/md/Makefile +++ b/drivers/md/Makefile | |||
@@ -17,7 +17,7 @@ raid456-objs := raid5.o raid6algos.o raid6recov.o raid6tables.o \ | |||
17 | hostprogs-y := mktables | 17 | hostprogs-y := mktables |
18 | 18 | ||
19 | # Note: link order is important. All raid personalities | 19 | # Note: link order is important. All raid personalities |
20 | # and xor.o must come before md.o, as they each initialise | 20 | # and must come before md.o, as they each initialise |
21 | # themselves, and md.o may use the personalities when it | 21 | # themselves, and md.o may use the personalities when it |
22 | # auto-initialised. | 22 | # auto-initialised. |
23 | 23 | ||
@@ -25,7 +25,7 @@ obj-$(CONFIG_MD_LINEAR) += linear.o | |||
25 | obj-$(CONFIG_MD_RAID0) += raid0.o | 25 | obj-$(CONFIG_MD_RAID0) += raid0.o |
26 | obj-$(CONFIG_MD_RAID1) += raid1.o | 26 | obj-$(CONFIG_MD_RAID1) += raid1.o |
27 | obj-$(CONFIG_MD_RAID10) += raid10.o | 27 | obj-$(CONFIG_MD_RAID10) += raid10.o |
28 | obj-$(CONFIG_MD_RAID456) += raid456.o xor.o | 28 | obj-$(CONFIG_MD_RAID456) += raid456.o |
29 | obj-$(CONFIG_MD_MULTIPATH) += multipath.o | 29 | obj-$(CONFIG_MD_MULTIPATH) += multipath.o |
30 | obj-$(CONFIG_MD_FAULTY) += faulty.o | 30 | obj-$(CONFIG_MD_FAULTY) += faulty.o |
31 | obj-$(CONFIG_BLK_DEV_MD) += md-mod.o | 31 | obj-$(CONFIG_BLK_DEV_MD) += md-mod.o |