Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
kernel_linux
提交
2144381d
K
kernel_linux
项目概览
OpenHarmony
/
kernel_linux
上一次同步 3 年多
通知
13
Star
8
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kernel_linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
2144381d
编写于
8月 09, 2010
作者:
D
David Woodhouse
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'async' of macbook:git/btrfs-unstable
Conflicts: drivers/md/Makefile lib/raid6/unroll.pl
上级
45d7f32c
e5d84970
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
97 addition
and
94 deletion
+97
-94
crypto/async_tx/Kconfig
crypto/async_tx/Kconfig
+14
-0
drivers/md/Kconfig
drivers/md/Kconfig
+1
-17
drivers/md/Makefile
drivers/md/Makefile
+0
-77
lib/Kconfig
lib/Kconfig
+3
-0
lib/Makefile
lib/Makefile
+1
-0
lib/raid6/Makefile
lib/raid6/Makefile
+78
-0
lib/raid6/mktables.c
lib/raid6/mktables.c
+0
-0
lib/raid6/raid6algos.c
lib/raid6/raid6algos.c
+0
-0
lib/raid6/raid6altivec.uc
lib/raid6/raid6altivec.uc
+0
-0
lib/raid6/raid6int.uc
lib/raid6/raid6int.uc
+0
-0
lib/raid6/raid6mmx.c
lib/raid6/raid6mmx.c
+0
-0
lib/raid6/raid6recov.c
lib/raid6/raid6recov.c
+0
-0
lib/raid6/raid6sse1.c
lib/raid6/raid6sse1.c
+0
-0
lib/raid6/raid6sse2.c
lib/raid6/raid6sse2.c
+0
-0
lib/raid6/raid6test/Makefile
lib/raid6/raid6test/Makefile
+0
-0
lib/raid6/raid6test/test.c
lib/raid6/raid6test/test.c
+0
-0
lib/raid6/raid6x86.h
lib/raid6/raid6x86.h
+0
-0
lib/raid6/unroll.awk
lib/raid6/unroll.awk
+0
-0
未找到文件。
crypto/async_tx/Kconfig
浏览文件 @
2144381d
...
...
@@ -22,6 +22,20 @@ config ASYNC_RAID6_RECOV
tristate
select ASYNC_CORE
select ASYNC_PQ
select ASYNC_XOR
config ASYNC_RAID6_TEST
tristate "Self test for hardware accelerated raid6 recovery"
depends on ASYNC_RAID6_RECOV
select ASYNC_MEMCPY
---help---
This is a one-shot self test that permutes through the
recovery of all the possible two disk failure scenarios for a
N-disk array. Recovery is performed with the asynchronous
raid6 recovery routines, and will optionally use an offload
engine if one is available.
If unsure, say N.
config ASYNC_TX_DISABLE_PQ_VAL_DMA
bool
...
...
drivers/md/Kconfig
浏览文件 @
2144381d
...
...
@@ -121,7 +121,7 @@ config MD_RAID10
config MD_RAID456
tristate "RAID-4/RAID-5/RAID-6 mode"
depends on BLK_DEV_MD
select
MD_
RAID6_PQ
select RAID6_PQ
select ASYNC_MEMCPY
select ASYNC_XOR
select ASYNC_PQ
...
...
@@ -165,22 +165,6 @@ config MULTICORE_RAID456
If unsure, say N.
config MD_RAID6_PQ
tristate
config ASYNC_RAID6_TEST
tristate "Self test for hardware accelerated raid6 recovery"
depends on MD_RAID6_PQ
select ASYNC_RAID6_RECOV
---help---
This is a one-shot self test that permutes through the
recovery of all the possible two disk failure scenarios for a
N-disk array. Recovery is performed with the asynchronous
raid6 recovery routines, and will optionally use an offload
engine if one is available.
If unsure, say N.
config MD_MULTIPATH
tristate "Multipath I/O support"
depends on BLK_DEV_MD
...
...
drivers/md/Makefile
浏览文件 @
2144381d
...
...
@@ -12,13 +12,6 @@ dm-log-userspace-y \
+=
dm-log-userspace-base.o
dm-log-userspace-transfer.o
md-mod-y
+=
md.o bitmap.o
raid456-y
+=
raid5.o
raid6_pq-y
+=
raid6algos.o raid6recov.o raid6tables.o
\
raid6int1.o raid6int2.o raid6int4.o
\
raid6int8.o raid6int16.o raid6int32.o
\
raid6altivec1.o raid6altivec2.o raid6altivec4.o
\
raid6altivec8.o
\
raid6mmx.o raid6sse1.o raid6sse2.o
hostprogs-y
+=
mktables
# Note: link order is important. All raid personalities
# and must come before md.o, as they each initialise
...
...
@@ -29,7 +22,6 @@ obj-$(CONFIG_MD_LINEAR) += linear.o
obj-$(CONFIG_MD_RAID0)
+=
raid0.o
obj-$(CONFIG_MD_RAID1)
+=
raid1.o
obj-$(CONFIG_MD_RAID10)
+=
raid10.o
obj-$(CONFIG_MD_RAID6_PQ)
+=
raid6_pq.o
obj-$(CONFIG_MD_RAID456)
+=
raid456.o
obj-$(CONFIG_MD_MULTIPATH)
+=
multipath.o
obj-$(CONFIG_MD_FAULTY)
+=
faulty.o
...
...
@@ -45,75 +37,6 @@ obj-$(CONFIG_DM_MIRROR) += dm-mirror.o dm-log.o dm-region-hash.o
obj-$(CONFIG_DM_LOG_USERSPACE)
+=
dm-log-userspace.o
obj-$(CONFIG_DM_ZERO)
+=
dm-zero.o
quiet_cmd_unroll
=
UNROLL
$@
cmd_unroll
=
$(AWK)
-f
$(srctree)
/
$(src)
/unroll.awk
-vN
=
$(UNROLL)
\
<
$<
>
$@
||
(
rm
-f
$@
&&
exit
1
)
ifeq
($(CONFIG_ALTIVEC),y)
altivec_flags
:=
-maltivec
-mabi
=
altivec
endif
ifeq
($(CONFIG_DM_UEVENT),y)
dm-mod-objs
+=
dm-uevent.o
endif
targets
+=
raid6int1.c
$(obj)/raid6int1.c
:
UNROLL := 1
$(obj)/raid6int1.c
:
$(src)/raid6int.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
targets
+=
raid6int2.c
$(obj)/raid6int2.c
:
UNROLL := 2
$(obj)/raid6int2.c
:
$(src)/raid6int.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
targets
+=
raid6int4.c
$(obj)/raid6int4.c
:
UNROLL := 4
$(obj)/raid6int4.c
:
$(src)/raid6int.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
targets
+=
raid6int8.c
$(obj)/raid6int8.c
:
UNROLL := 8
$(obj)/raid6int8.c
:
$(src)/raid6int.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
targets
+=
raid6int16.c
$(obj)/raid6int16.c
:
UNROLL := 16
$(obj)/raid6int16.c
:
$(src)/raid6int.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
targets
+=
raid6int32.c
$(obj)/raid6int32.c
:
UNROLL := 32
$(obj)/raid6int32.c
:
$(src)/raid6int.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
CFLAGS_raid6altivec1.o
+=
$(altivec_flags)
targets
+=
raid6altivec1.c
$(obj)/raid6altivec1.c
:
UNROLL := 1
$(obj)/raid6altivec1.c
:
$(src)/raid6altivec.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
CFLAGS_raid6altivec2.o
+=
$(altivec_flags)
targets
+=
raid6altivec2.c
$(obj)/raid6altivec2.c
:
UNROLL := 2
$(obj)/raid6altivec2.c
:
$(src)/raid6altivec.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
CFLAGS_raid6altivec4.o
+=
$(altivec_flags)
targets
+=
raid6altivec4.c
$(obj)/raid6altivec4.c
:
UNROLL := 4
$(obj)/raid6altivec4.c
:
$(src)/raid6altivec.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
CFLAGS_raid6altivec8.o
+=
$(altivec_flags)
targets
+=
raid6altivec8.c
$(obj)/raid6altivec8.c
:
UNROLL := 8
$(obj)/raid6altivec8.c
:
$(src)/raid6altivec.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
quiet_cmd_mktable
=
TABLE
$@
cmd_mktable
=
$(obj)
/mktables
>
$@
||
(
rm
-f
$@
&&
exit
1
)
targets
+=
raid6tables.c
$(obj)/raid6tables.c
:
$(obj)/mktables FORCE
$(
call
if_changed,mktable
)
lib/Kconfig
浏览文件 @
2144381d
...
...
@@ -7,6 +7,9 @@ config BINARY_PRINTF
menu "Library routines"
config RAID6_PQ
tristate
config BITREVERSE
tristate
...
...
lib/Makefile
浏览文件 @
2144381d
...
...
@@ -69,6 +69,7 @@ obj-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate/
obj-$(CONFIG_REED_SOLOMON)
+=
reed_solomon/
obj-$(CONFIG_LZO_COMPRESS)
+=
lzo/
obj-$(CONFIG_LZO_DECOMPRESS)
+=
lzo/
obj-$(CONFIG_RAID6_PQ)
+=
raid6/
lib-$(CONFIG_DECOMPRESS_GZIP)
+=
decompress_inflate.o
lib-$(CONFIG_DECOMPRESS_BZIP2)
+=
decompress_bunzip2.o
...
...
lib/raid6/Makefile
0 → 100644
浏览文件 @
2144381d
obj-$(CONFIG_RAID6_PQ)
+=
raid6_pq.o
raid6_pq-y
+=
raid6algos.o raid6recov.o raid6tables.o
\
raid6int1.o raid6int2.o raid6int4.o
\
raid6int8.o raid6int16.o raid6int32.o
\
raid6altivec1.o raid6altivec2.o raid6altivec4.o
\
raid6altivec8.o
\
raid6mmx.o raid6sse1.o raid6sse2.o
hostprogs-y
+=
mktables
quiet_cmd_unroll
=
UNROLL
$@
cmd_unroll
=
$(AWK)
-f
$(srctree)
/
$(src)
/unroll.awk
-vN
=
$(UNROLL)
\
<
$<
>
$@
||
(
rm
-f
$@
&&
exit
1
)
ifeq
($(CONFIG_ALTIVEC),y)
altivec_flags
:=
-maltivec
-mabi
=
altivec
endif
targets
+=
raid6int1.c
$(obj)/raid6int1.c
:
UNROLL := 1
$(obj)/raid6int1.c
:
$(src)/raid6int.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
targets
+=
raid6int2.c
$(obj)/raid6int2.c
:
UNROLL := 2
$(obj)/raid6int2.c
:
$(src)/raid6int.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
targets
+=
raid6int4.c
$(obj)/raid6int4.c
:
UNROLL := 4
$(obj)/raid6int4.c
:
$(src)/raid6int.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
targets
+=
raid6int8.c
$(obj)/raid6int8.c
:
UNROLL := 8
$(obj)/raid6int8.c
:
$(src)/raid6int.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
targets
+=
raid6int16.c
$(obj)/raid6int16.c
:
UNROLL := 16
$(obj)/raid6int16.c
:
$(src)/raid6int.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
targets
+=
raid6int32.c
$(obj)/raid6int32.c
:
UNROLL := 32
$(obj)/raid6int32.c
:
$(src)/raid6int.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
CFLAGS_raid6altivec1.o
+=
$(altivec_flags)
targets
+=
raid6altivec1.c
$(obj)/raid6altivec1.c
:
UNROLL := 1
$(obj)/raid6altivec1.c
:
$(src)/raid6altivec.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
CFLAGS_raid6altivec2.o
+=
$(altivec_flags)
targets
+=
raid6altivec2.c
$(obj)/raid6altivec2.c
:
UNROLL := 2
$(obj)/raid6altivec2.c
:
$(src)/raid6altivec.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
CFLAGS_raid6altivec4.o
+=
$(altivec_flags)
targets
+=
raid6altivec4.c
$(obj)/raid6altivec4.c
:
UNROLL := 4
$(obj)/raid6altivec4.c
:
$(src)/raid6altivec.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
CFLAGS_raid6altivec8.o
+=
$(altivec_flags)
targets
+=
raid6altivec8.c
$(obj)/raid6altivec8.c
:
UNROLL := 8
$(obj)/raid6altivec8.c
:
$(src)/raid6altivec.uc $(src)/unroll.awk FORCE
$(
call
if_changed,unroll
)
quiet_cmd_mktable
=
TABLE
$@
cmd_mktable
=
$(obj)
/mktables
>
$@
||
(
rm
-f
$@
&&
exit
1
)
targets
+=
raid6tables.c
$(obj)/raid6tables.c
:
$(obj)/mktables FORCE
$(
call
if_changed,mktable
)
drivers/md
/mktables.c
→
lib/raid6
/mktables.c
浏览文件 @
2144381d
文件已移动
drivers/md
/raid6algos.c
→
lib/raid6
/raid6algos.c
浏览文件 @
2144381d
文件已移动
drivers/md
/raid6altivec.uc
→
lib/raid6
/raid6altivec.uc
浏览文件 @
2144381d
文件已移动
drivers/md
/raid6int.uc
→
lib/raid6
/raid6int.uc
浏览文件 @
2144381d
文件已移动
drivers/md
/raid6mmx.c
→
lib/raid6
/raid6mmx.c
浏览文件 @
2144381d
文件已移动
drivers/md
/raid6recov.c
→
lib/raid6
/raid6recov.c
浏览文件 @
2144381d
文件已移动
drivers/md
/raid6sse1.c
→
lib/raid6
/raid6sse1.c
浏览文件 @
2144381d
文件已移动
drivers/md
/raid6sse2.c
→
lib/raid6
/raid6sse2.c
浏览文件 @
2144381d
文件已移动
drivers/md
/raid6test/Makefile
→
lib/raid6
/raid6test/Makefile
浏览文件 @
2144381d
文件已移动
drivers/md
/raid6test/test.c
→
lib/raid6
/raid6test/test.c
浏览文件 @
2144381d
文件已移动
drivers/md
/raid6x86.h
→
lib/raid6
/raid6x86.h
浏览文件 @
2144381d
文件已移动
drivers/md
/unroll.awk
→
lib/raid6
/unroll.awk
浏览文件 @
2144381d
文件已移动
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录