Commit 7367f5b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://neil.brown.name/md 

* 'for-linus' of git://neil.brown.name/md:
  Further tidyup of raid6 naming in lib/raid6
  Make lib/raid6/test build correctly.
  Rename raid6 files now they're in a 'raid6' directory.
parents ce4327d3 a8e026c7

include/linux/raid/pq.h

+2 −0
Original line number Diff line number Diff line
@@ -62,7 +62,9 @@ extern const char raid6_empty_zero_page[PAGE_SIZE]; 
#define disable_kernel_altivec()



#define EXPORT_SYMBOL(sym)

#define EXPORT_SYMBOL_GPL(sym)

#define MODULE_LICENSE(licence)

#define MODULE_DESCRIPTION(desc)

#define subsys_initcall(x)

#define module_exit(x)

#endif /* __KERNEL__ */

lib/raid6/Makefile

+39 −42
Original line number Diff line number Diff line 
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

raid6_pq-y	+= algos.o recov.o tables.o int1.o int2.o int4.o \

		   int8.o int16.o int32.o altivec1.o altivec2.o altivec4.o \

		   altivec8.o mmx.o sse1.o sse2.o

hostprogs-y	+= mktables



quiet_cmd_unroll = UNROLL  $@
@@ -16,63 +13,63 @@ 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

targets += int1.c

$(obj)/int1.c:   UNROLL := 1

$(obj)/int1.c:   $(src)/int.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

targets += int2.c

$(obj)/int2.c:   UNROLL := 2

$(obj)/int2.c:   $(src)/int.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

targets += int4.c

$(obj)/int4.c:   UNROLL := 4

$(obj)/int4.c:   $(src)/int.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

targets += int8.c

$(obj)/int8.c:   UNROLL := 8

$(obj)/int8.c:   $(src)/int.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

targets += int16.c

$(obj)/int16.c:  UNROLL := 16

$(obj)/int16.c:  $(src)/int.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

targets += int32.c

$(obj)/int32.c:  UNROLL := 32

$(obj)/int32.c:  $(src)/int.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

CFLAGS_altivec1.o += $(altivec_flags)

targets += altivec1.c

$(obj)/altivec1.c:   UNROLL := 1

$(obj)/altivec1.c:   $(src)/altivec.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

CFLAGS_altivec2.o += $(altivec_flags)

targets += altivec2.c

$(obj)/altivec2.c:   UNROLL := 2

$(obj)/altivec2.c:   $(src)/altivec.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

CFLAGS_altivec4.o += $(altivec_flags)

targets += altivec4.c

$(obj)/altivec4.c:   UNROLL := 4

$(obj)/altivec4.c:   $(src)/altivec.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

CFLAGS_altivec8.o += $(altivec_flags)

targets += altivec8.c

$(obj)/altivec8.c:   UNROLL := 8

$(obj)/altivec8.c:   $(src)/altivec.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

targets += tables.c

$(obj)/tables.c: $(obj)/mktables FORCE

	$(call if_changed,mktable)

lib/raid6/raid6algos.c→lib/raid6/algos.c

+2 −2
Original line number Diff line number Diff line
@@ -11,17 +11,17 @@ 
 * ----------------------------------------------------------------------- */



/*

 * raid6algos.c

 * raid6/algos.c

 *

 * Algorithm list and algorithm selection for RAID-6

 */



#include <linux/raid/pq.h>

#include <linux/gfp.h>

#ifndef __KERNEL__

#include <sys/mman.h>

#include <stdio.h>

#else

#include <linux/gfp.h>

#if !RAID6_USE_EMPTY_ZERO_PAGE

/* In .bss so it's zeroed */

const char raid6_empty_zero_page[PAGE_SIZE] __attribute__((aligned(256)));

lib/raid6/raid6altivec.uc→lib/raid6/altivec.uc

+0 −0

File moved.

View file

lib/raid6/raid6int.uc→lib/raid6/int.uc

+0 −0

File moved.

View file