diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 09:08:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 09:08:19 -0700 |
| commit | 223cdea4c4b5af5181b2da00ac85711d1e0c737c (patch) | |
| tree | dfe7226c70ddabbf2e2e63924ba636345278e79c /crypto | |
| parent | 31e6e2dac575c9d21a6ec56ca52ae89086baa705 (diff) | |
| parent | c8f517c444e4f9f55b5b5ca202b8404691a35805 (diff) | |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md: (53 commits)
md/raid5 revise rules for when to update metadata during reshape
md/raid5: minor code cleanups in make_request.
md: remove CONFIG_MD_RAID_RESHAPE config option.
md/raid5: be more careful about write ordering when reshaping.
md: don't display meaningless values in sysfs files resync_start and sync_speed
md/raid5: allow layout and chunksize to be changed on active array.
md/raid5: reshape using largest of old and new chunk size
md/raid5: prepare for allowing reshape to change layout
md/raid5: prepare for allowing reshape to change chunksize.
md/raid5: clearly differentiate 'before' and 'after' stripes during reshape.
Documentation/md.txt update
md: allow number of drives in raid5 to be reduced
md/raid5: change reshape-progress measurement to cope with reshaping backwards.
md: add explicit method to signal the end of a reshape.
md/raid5: enhance raid5_size to work correctly with negative delta_disks
md/raid5: drop qd_idx from r6_state
md/raid6: move raid6 data processing to raid6_pq.ko
md: raid5 run(): Fix max_degraded for raid level 4.
md: 'array_size' sysfs attribute
md: centralize ->array_sectors modifications
...
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/xor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/xor.c b/crypto/xor.c index b2e6db075e49..996b6ee57d9e 100644 --- a/crypto/xor.c +++ b/crypto/xor.c @@ -18,8 +18,8 @@ #define BH_TRACE 0 #include <linux/module.h> -#include <linux/raid/md.h> #include <linux/raid/xor.h> +#include <linux/jiffies.h> #include <asm/xor.h> /* The xor routines to use. */ |