Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2144381d authored by David Woodhouse's avatar David Woodhouse
Browse files

Merge branch 'async' of macbook:git/btrfs-unstable 

Conflicts:
	drivers/md/Makefile
	lib/raid6/unroll.pl
parents 45d7f32c e5d84970

crypto/async_tx/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -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

+1 −17
Original line number Diff line number Diff line
@@ -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

+0 −77
Original line number Diff line number Diff line
@@ -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

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ config BINARY_PRINTF 


menu "Library routines"



config RAID6_PQ

	tristate



config BITREVERSE

	tristate

lib/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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