patch-2.4.0-test12 linux/drivers/md/Makefile

• Lines: 32
• Date: Mon Dec 11 13:19:34 2000
• Orig file: v2.4.0-test11/linux/drivers/md/Makefile
• Orig date: Sun Oct 8 10:50:18 2000

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/md/Makefile linux/drivers/md/Makefile
@@ -16,18 +16,26 @@
 obj-n		:=
 obj-		:=
 
-obj-$(CONFIG_BLK_DEV_MD)	+= md.o
+# Note: link order is important.  All raid personalities
+# and xor.o must come before md.o, as they each initialise 
+# themselves, and md.o may use the personalities when it 
+# auto-initialised.
+# The use of MIX_OBJS allows link order to be maintained even
+# though some are export-objs and some aren't.
+
 obj-$(CONFIG_MD_LINEAR)		+= linear.o
 obj-$(CONFIG_MD_RAID0)		+= raid0.o
 obj-$(CONFIG_MD_RAID1)		+= raid1.o
 obj-$(CONFIG_MD_RAID5)		+= raid5.o xor.o
+obj-$(CONFIG_BLK_DEV_MD)	+= md.o
 obj-$(CONFIG_BLK_DEV_LVM)	+= lvm-mod.o
 
 # Translate to Rules.make lists.
-O_OBJS		:= $(filter-out $(export-objs), $(obj-y))
-OX_OBJS		:= $(filter     $(export-objs), $(obj-y))
-M_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-m)))
-MX_OBJS		:= $(sort $(filter      $(export-objs), $(obj-m)))
+active-objs	:= $(sort $(obj-y) $(obj-m))
+
+O_OBJS		:= $(obj-y)
+M_OBJS		:= $(obj-m)
+MIX_OBJS	:= $(filter $(export-objs), $(active-objs))
 
 include $(TOPDIR)/Rules.make