Skip to content

L
linux
Commit 99234b21 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

- Linus: drop support for old-style Makefiles entirely. Big. 

- Linus: check b_end_io at the IO submission path
- Linus: fix "ptep_mkdirty()" (so that swapoff() works correctly)
- fix fault case in copy_from_user() with a constant size, where ((size & 3) == 3)
parent 566c4337
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 604 additions and 1856 deletions
Makefile
View file @ 99234b21
......@@ -123,8 +123,7 @@ DRIVERS =drivers/block/block.o \
drivers/char/char.o \
drivers/misc/misc.o \
drivers/net/net.o \
drivers/media/media.o \
drivers/parport/parport.a
drivers/media/media.o
LIBS =$(TOPDIR)/lib/lib.a
SUBDIRS =kernel drivers mm fs net ipc lib
......@@ -133,6 +132,7 @@ DRIVERS-y :=
DRIVERS-m :=
DRIVERS- :=
DRIVERS-$(CONFIG_PARPORT) += drivers/parport/driver.o
DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o
DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
......@@ -148,11 +148,11 @@ DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394.a
ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR)$(CONFIG_PARIDE_PCD),)
DRIVERS-y += drivers/cdrom/cdrom.a
DRIVERS-y += drivers/cdrom/driver.o
endif
DRIVERS-$(CONFIG_SOUND) += drivers/sound/sounddrivers.o
DRIVERS-$(CONFIG_PCI) += drivers/pci/pci.a
DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o
DRIVERS-$(CONFIG_PCMCIA_NETCARD) += drivers/net/pcmcia/pcmcia_net.o
......
Rules.make
View file @ 99234b21
......@@ -22,15 +22,17 @@ unexport O_TARGET
unexport O_OBJS
unexport L_OBJS
unexport M_OBJS
# intermediate objects that form part of a module
unexport MI_OBJS
unexport ALL_MOBJS
# objects that export symbol tables
unexport OX_OBJS
unexport LX_OBJS
unexport MX_OBJS
unexport MIX_OBJS
unexport SYMTAB_OBJS
unexport obj-y
unexport obj-m
unexport obj-n
unexport obj-
unexport export-objs
unexport subdir-y
unexport subdir-m
unexport subdir-n
unexport subdir-
#
# Get things started.
......@@ -38,6 +40,11 @@ unexport SYMTAB_OBJS
first_rule: sub_dirs
$(MAKE) all_targets
SUB_DIRS := $(subdir-y)
MOD_SUB_DIRS := $(sort $(subdir-m) $(both-m))
ALL_SUB_DIRS := $(sort $(subdir-y) $(subdir-m) $(subdir-n) $(subdir-))
#
# Common rules
#
......@@ -85,16 +92,15 @@ all_targets: $(O_TARGET) $(L_TARGET)
# Rule to compile a set of .o files into one .o file
#
ifdef O_TARGET
ALL_O = $(OX_OBJS) $(O_OBJS)
$(O_TARGET): $(ALL_O)
$(O_TARGET): $(obj-y)
rm -f $@
ifneq "$(strip $(ALL_O))" ""
$(LD) $(EXTRA_LDFLAGS) -r -o $@ $(filter $(ALL_O), $^)
ifneq "$(strip $(obj-y))" ""
$(LD) $(EXTRA_LDFLAGS) -r -o $@ $(filter $(obj-y), $^)
else
$(AR) rcs $@ $(filter $(ALL_O), $^)
$(AR) rcs $@
endif
@ ( \
echo 'ifeq ($(strip $(subst $(comma),:,$(EXTRA_LDFLAGS) $(ALL_O))),$$(strip $$(subst $$(comma),:,$$(EXTRA_LDFLAGS) $$(ALL_O))))' ; \
echo 'ifeq ($(strip $(subst $(comma),:,$(EXTRA_LDFLAGS) $(obj-y))),$$(strip $$(subst $$(comma),:,$$(EXTRA_LDFLAGS) $$(obj-y))))' ; \
echo 'FILES_FLAGS_UP_TO_DATE += $@' ; \
echo 'endif' \
) > $(dir $@)/.$(notdir $@).flags
......@@ -104,16 +110,17 @@ endif # O_TARGET
# Rule to compile a set of .o files into one .a file
#
ifdef L_TARGET
$(L_TARGET): $(LX_OBJS) $(L_OBJS)
$(L_TARGET): $(obj-y)
rm -f $@
$(AR) $(EXTRA_ARFLAGS) rcs $@ $(LX_OBJS) $(L_OBJS)
$(AR) $(EXTRA_ARFLAGS) rcs $@ $(LX_OBJS) $(obj-y)
@ ( \
echo 'ifeq ($(strip $(subst $(comma),:,$(EXTRA_ARFLAGS) $(LX_OBJS) $(L_OBJS))),$$(strip $$(subst $$(comma),:,$$(EXTRA_ARFLAGS) $$(LX_OBJS) $$(L_OBJS))))' ; \
echo 'ifeq ($(strip $(subst $(comma),:,$(EXTRA_ARFLAGS) $(obj-y))),$$(strip $$(subst $$(comma),:,$$(EXTRA_ARFLAGS) $$(obj-y))))' ; \
echo 'FILES_FLAGS_UP_TO_DATE += $@' ; \
echo 'endif' \
) > $(dir $@)/.$(notdir $@).flags
endif
#
# This make dependencies quickly
#
......@@ -142,7 +149,7 @@ endif
#
# A rule to make modules
#
ALL_MOBJS = $(MX_OBJS) $(M_OBJS)
ALL_MOBJS = $(filter-out $(obj-y), $(obj-m))
ifneq "$(strip $(ALL_MOBJS))" ""
PDWN=$(shell $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh)
endif
......@@ -160,7 +167,7 @@ $(patsubst %,_modinst_%,$(MOD_DIRS)) : dummy
endif
.PHONY: modules
modules: $(ALL_MOBJS) $(MIX_OBJS) $(MI_OBJS) dummy \
modules: $(ALL_MOBJS) dummy \
$(patsubst %,_modsubdir_%,$(MOD_DIRS))
.PHONY: _modinst__
......@@ -193,7 +200,10 @@ script:
#
ifdef CONFIG_MODULES
SYMTAB_OBJS = $(LX_OBJS) $(OX_OBJS) $(MX_OBJS) $(MIX_OBJS)
multi-used := $(filter $(list-multi), $(obj-y) $(obj-m))
multi-objs := $(foreach m, $(multi-used), $($(basename $(m))-objs))
active-objs := $(sort $(multi-objs) $(obj-y) $(obj-m))
SYMTAB_OBJS := $(filter $(export-objs), $(active-objs))
ifdef CONFIG_MODVERSIONS
ifneq "$(strip $(SYMTAB_OBJS))" ""
......@@ -308,7 +318,6 @@ FILES_FLAGS_CHANGED := $(strip \
$(O_TARGET) $(O_OBJS) $(OX_OBJS) \
$(L_TARGET) $(L_OBJS) $(LX_OBJS) \
$(M_OBJS) $(MX_OBJS) \
$(MI_OBJS) $(MIX_OBJS) \
))
# A kludge: .S files don't get flag dependencies (yet),
......
arch/i386/Makefile
View file @ 99234b21
......@@ -85,12 +85,13 @@ endif
HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
SUBDIRS += arch/i386/kernel arch/i386/mm arch/i386/lib
CORE_FILES := arch/i386/kernel/kernel.o arch/i386/mm/mm.o $(CORE_FILES)
LIBS := $(TOPDIR)/arch/i386/lib/lib.a $(LIBS) $(TOPDIR)/arch/i386/lib/lib.a
ifdef CONFIG_MATH_EMULATION
SUBDIRS += arch/i386/math-emu
DRIVERS += arch/i386/math-emu/math.a
SUBDIRS += arch/i386/math-emu/math.o
endif
arch/i386/kernel: dummy
......
arch/i386/kernel/Makefile
View file @ 99234b21
......@@ -46,9 +46,4 @@ ifneq ($(CONFIG_ACPI_INTERPRETER),y)
obj-$(CONFIG_ACPI) += acpi.o
endif
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)))
include $(TOPDIR)/Rules.make
arch/i386/lib/Makefile
View file @ 99234b21
......@@ -6,16 +6,12 @@
$(CC) $(AFLAGS) -c $< -o $*.o
L_TARGET = lib.a
L_OBJS = checksum.o old-checksum.o delay.o \
obj-y = checksum.o old-checksum.o delay.o \
usercopy.o getuser.o putuser.o iodebug.o \
memcpy.o
ifdef CONFIG_X86_USE_3DNOW
L_OBJS += mmx.o
endif
ifdef CONFIG_HAVE_DEC_LOCK
L_OBJS += dec_and_lock.o
endif
obj-$(CONFIG_X86_USE_3DNOW) += mmx.o
obj-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o
include $(TOPDIR)/Rules.make
arch/i386/math-emu/Makefile
View file @ 99234b21
......@@ -2,7 +2,7 @@
# Makefile for wm-FPU-emu
#
L_TARGET := math.a
O_TARGET := math.o
#DEBUG = -DDEBUGGING
DEBUG =
......@@ -27,7 +27,7 @@ A_OBJS =reg_u_add.o reg_u_div.o reg_u_mul.o reg_u_sub.o \
div_Xsig.o polynom_Xsig.o round_Xsig.o \
shr_Xsig.o mul_Xsig.o
L_OBJS =$(C_OBJS) $(A_OBJS)
obj-y =$(C_OBJS) $(A_OBJS)
include $(TOPDIR)/Rules.make
......
arch/i386/mm/Makefile
View file @ 99234b21
......@@ -8,6 +8,7 @@
# Note 2! The CFLAGS definition is now in the main makefile...
O_TARGET := mm.o
O_OBJS := init.o fault.o ioremap.o extable.o
obj-y := init.o fault.o ioremap.o extable.o
include $(TOPDIR)/Rules.make
drivers/Makefile
View file @ 99234b21
......@@ -47,13 +47,5 @@ subdir-$(CONFIG_ACPI) += acpi
# Subdirectories that should be entered when MAKING_MODULES=1, even if set to 'y'.
both-m := $(filter $(mod-subdirs), $(subdir-y))
# Translate to Rules.make lists.
SUB_DIRS := $(subdir-y)
MOD_SUB_DIRS := $(sort $(subdir-m) $(both-m))
ALL_SUB_DIRS := $(sort $(subdir-y) $(subdir-m) $(subdir-n) $(subdir-))
# net/hamradio is already in ALL_SUB_DIRS of drivers/net/Makefile
ALL_SUB_DIRS := $(filter-out net/hamradio, $(ALL_SUB_DIRS))
include $(TOPDIR)/Rules.make
drivers/block/Makefile
View file @ 99234b21
......@@ -8,10 +8,6 @@
# In the future, some of these should be built conditionally.
#
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS) paride
O_TARGET := block.o
export-objs := ll_rw_blk.o blkpg.o loop.o DAC960.o
......@@ -36,30 +32,6 @@ obj-$(CONFIG_BLK_DEV_DAC960) += DAC960.o
obj-$(CONFIG_BLK_DEV_NBD) += nbd.o
ifeq ($(CONFIG_PARIDE),y)
SUB_DIRS += paride
MOD_IN_SUB_DIRS += paride
else
ifeq ($(CONFIG_PARIDE),m)
MOD_IN_SUB_DIRS += paride
endif
endif
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Take multi-part drivers out of obj-y and put components in.
obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
# 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)))
subdir-$(CONFIG_PARIDE) += paride
include $(TOPDIR)/Rules.make
drivers/block/ll_rw_blk.c
View file @ 99234b21
......@@ -885,6 +885,8 @@ void generic_make_request (int rw, struct buffer_head * bh)
{
int major = MAJOR(bh->b_rdev);
request_queue_t *q;
if (!bh->b_end_io) BUG();
if (blk_size[major]) {
unsigned long maxsector = (blk_size[major][MINOR(bh->b_rdev)] << 1) + 1;
unsigned int sector, count;
......
drivers/block/paride/Makefile
View file @ 99234b21
......@@ -28,7 +28,4 @@ obj-$(CONFIG_PARIDE_ON20) += on20.o
obj-$(CONFIG_PARIDE_ON26) += on26.o
obj-$(CONFIG_PARIDE_KTTI) += ktti.o
L_OBJS := $(obj-y)
M_OBJS := $(obj-m)
include $(TOPDIR)/Rules.make
drivers/cdrom/Makefile
View file @ 99234b21
......@@ -3,6 +3,7 @@
# 30 Jan 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net>
# Rewritten to use lists instead of if-statements.
O_TARGET := driver.o
# All of the (potential) objects that export symbols.
......@@ -42,25 +43,6 @@ obj-$(CONFIG_SBPCD4) += sbpcd4.o cdrom.o
obj-$(CONFIG_SJCD) += sjcd.o
obj-$(CONFIG_CDU535) += sonycd535.o
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
# Translate to Rules.make lists.
L_TARGET := cdrom.a
L_OBJS := $(sort $(filter-out $(export-objs), $(obj-y)))
LX_OBJS := $(sort $(filter $(export-objs), $(obj-y)))
M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m)))
MX_OBJS := $(sort $(filter $(export-objs), $(obj-m)))
# Hand off to Rules.make.
include $(TOPDIR)/Rules.make
drivers/char/Makefile
View file @ 99234b21
......@@ -9,28 +9,13 @@
# parent makes..
#
O_OBJS :=
OX_OBJS :=
M_OBJS :=
MX_OBJS :=
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS) ftape joystick pcmcia rio drm agp
#
# This file contains the font map for the default (hardware) font
#
FONTMAPFILE = cp437.uni
O_TARGET := char.o
obj-y += tty_io.o n_tty.o tty_ioctl.o mem.o raw.o pty.o misc.o random.o
# All of the (potential) objects that export symbols.
......@@ -135,13 +120,8 @@ obj-$(CONFIG_SERIAL167) += serial167.o
obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
ifeq ($(CONFIG_RIO),y)
SUB_DIRS += rio
else
ifeq ($(CONFIG_RIO),m)
MOD_SUB_DIRS += rio
endif
endif
subdir-$(CONFIG_RIO) += rio
subdir-$(CONFIG_INPUT) += joystick
obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o
obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o
......@@ -149,12 +129,6 @@ obj-$(CONFIG_PRINTER) += lp.o
ifeq ($(CONFIG_INPUT),y)
obj-y += joystick/js.o
SUB_DIRS += joystick
MOD_SUB_DIRS += joystick
else
ifeq ($(CONFIG_INPUT),m)
MOD_SUB_DIRS += joystick
endif
endif
obj-$(CONFIG_BUSMOUSE) += busmouse.o
......@@ -178,16 +152,13 @@ obj-$(CONFIG_INTEL_RNG) += i810_rng.o
obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
subdir-$(CONFIG_FTAPE) += ftape
subdir-$(CONFIG_DRM) += drm
subdir-$(CONFIG_PCMCIA) += pcmcia
subdir-$(CONFIG_agp) += agp
ifeq ($(CONFIG_FTAPE),y)
obj-y += ftape/ftape.o
SUB_DIRS += ftape
ifneq ($(CONFIG_ZFTAPE),n)
MOD_SUB_DIRS += ftape
endif
else
ifeq ($(CONFIG_FTAPE),m)
MOD_SUB_DIRS += ftape
endif
endif
obj-$(CONFIG_H8) += h8.o
......@@ -196,33 +167,6 @@ obj-$(CONFIG_DZ) += dz.o
obj-$(CONFIG_NWBUTTON) += nwbutton.o
obj-$(CONFIG_NWFLASH) += nwflash.o
ifeq ($(CONFIG_DRM),y)
SUB_DIRS += drm
MOD_SUB_DIRS += drm
else
ifeq ($(CONFIG_DRM),m)
MOD_SUB_DIRS += drm
endif
endif
ifeq ($(CONFIG_PCMCIA),y)
SUB_DIRS += pcmcia
MOD_IN_SUB_DIRS += pcmcia
else
ifeq ($(CONFIG_PCMCIA),m)
MOD_IN_SUB_DIRS += pcmcia
endif
endif
ifeq ($(CONFIG_AGP), y)
SUB_DIRS += agp
MOD_SUB_DIRS += agp
else
ifeq ($(CONFIG_AGP), m)
MOD_SUB_DIRS += agp
endif
endif
# Only one watchdog can succeed. We probe the hardware watchdog
# drivers first, then the softdog driver. This means if your hardware
# watchdog dies or is 'borrowed' for some reason the software watchdog
......@@ -240,32 +184,6 @@ obj-$(CONFIG_I810_TCO) += i810-tco.o
obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
int-m := $(filter-out $(int-y), $(int-m))
# Take multi-part drivers out of obj-y and put components in.
obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
# 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)))
MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m)))
MIX_OBJS := $(sort $(filter $(export-objs), $(int-m)))
include $(TOPDIR)/Rules.make
fastdep:
......
drivers/char/agp/Makefile
View file @ 99234b21
......@@ -5,18 +5,14 @@
O_TARGET := agp.o
ifeq ($(CONFIG_AGP),y)
O_OBJS += agpgart_fe.o
OX_OBJS += agpgart_be.o
else
ifeq ($(CONFIG_AGP), m)
MI_OBJS += agpgart_fe.o
MIX_OBJS += agpgart_be.o
M_OBJS += agpgart.o
endif
endif
export-objs := agpgart_be.o
multi-objs := agpgart.o
agpgart-objs := agpgart_fe.o agpgart_be.o
obj-$(CONFIG_AGP) += agpgart.o
include $(TOPDIR)/Rules.make
agpgart.o: agpgart_be.o agpgart_fe.o
$(LD) $(LD_RFLAG) -r -o $@ agpgart_be.o agpgart_fe.o
agpgart.o: $(agpgart-objs)
$(LD) $(LD_RFLAG) -r -o $@ $(agpgart-objs)
drivers/char/drm/Makefile
View file @ 99234b21
......@@ -6,6 +6,7 @@
# drm.o is a fake target -- it is never built
# The real targets are in the module-list
O_TARGET := drm.o
module-list := gamma.o tdfx.o r128.o ffb.o mga.o i810.o
export-objs := $(patsubst %.o,%_drv.o,$(module-list))
......@@ -44,29 +45,16 @@ mga-objs := $(lib-objs) mga_drv.o mga_dma.o mga_context.o mga_bufs.o \
mga_state.o
i810-objs := $(lib-objs) i810_drv.o i810_dma.o i810_context.o i810_bufs.o
obj-$(CONFIG_DRM_GAMMA) += gamma.o $(gamma-objs)
obj-$(CONFIG_DRM_TDFX) += tdfx.o $(tdfx-objs)
obj-$(CONFIG_DRM_R128) += r128.o $(r128-objs)
obj-$(CONFIG_DRM_FFB) += ffb.o $(ffb-objs)
obj-$(CONFIG_DRM_GAMMA) += gamma.o
obj-$(CONFIG_DRM_TDFX) += tdfx.o
obj-$(CONFIG_DRM_R128) += r128.o
obj-$(CONFIG_DRM_FFB) += ffb.o
ifneq ($CONFIG_AGP),)
obj-$(CONFIG_DRM_MGA) += mga.o $(mga-objs)
obj-$(CONFIG_DRM_I810) += i810.o $(i810-objs)
obj-$(CONFIG_DRM_MGA) += mga.o
obj-$(CONFIG_DRM_I810) += i810.o
endif
# Take module names out of obj-y and int-m
obj-y := $(filter-out $(module-list), $(obj-y))
int-m := $(filter-out $(module-list), $(obj-m))
# Translate to Rules.make lists.
O_OBJS := $(filter-out $(export-objs), $(obj-y))
OX_OBJS := $(filter $(export-objs), $(obj-y))
M_OBJS := $(sort $(filter $(module-list), $(obj-m)))
MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m)))
MIX_OBJS := $(sort $(filter $(export-objs), $(int-m)))
include $(TOPDIR)/Rules.make
gamma.o: $(gamma-objs)
......
drivers/char/pcmcia/Makefile
View file @ 99234b21
......@@ -18,9 +18,4 @@ obj- :=
obj-$(CONFIG_PCMCIA_SERIAL_CS) += serial_cs.o
obj-$(CONFIG_PCMCIA_SERIAL_CB) += serial_cb.o
O_OBJS := $(obj-y)
OX_OBJS :=
M_OBJS := $(obj-m)
MX_OBJS :=
include $(TOPDIR)/Rules.make
drivers/char/rio/Makefile
View file @ 99234b21
......@@ -13,10 +13,9 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := rio.o
O_OBJS := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \
obj-y := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \
rioparam.o riopcicopy.o rioroute.o riotable.o riotty.o
M_OBJS := $(O_TARGET)
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
rio.o: $(O_OBJS)
\ No newline at end of file
drivers/ide/Makefile
View file @ 99234b21
......@@ -8,16 +8,23 @@
# In the future, some of these should be built conditionally.
#
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS)
O_TARGET := idedriver.o
export-objs := ide.o ide-features.o
list-multi := ide-mod.o ide-probe-mod.o
obj-y :=
obj-m :=
ide-obj-y :=
obj-$(CONFIG_BLK_DEV_HD) += hd.o
obj-$(CONFIG_BLK_DEV_IDE) += ide-mod.o ide-probe-mod.o
obj-$(CONFIG_BLK_DEV_IDECS) += ide-cs.o
obj-$(CONFIG_BLK_DEV_IDEDISK) += ide-disk.o
obj-$(CONFIG_BLK_DEV_IDECD) += ide-cd.o
obj-$(CONFIG_BLK_DEV_IDETAPE) += ide-tape.o
obj-$(CONFIG_BLK_DEV_IDEFLOPPY) += ide-floppy.o
ide-obj-$(CONFIG_BLK_DEV_AEC62XX) += aec62xx.o
ide-obj-$(CONFIG_BLK_DEV_ALI14XX) += ali14xx.o
ide-obj-$(CONFIG_BLK_DEV_ALI15X3) += alim15x3.o
......@@ -31,7 +38,6 @@ ide-obj-$(CONFIG_BLK_DEV_DTC2278) += dtc2278.o
ide-obj-$(CONFIG_BLK_DEV_FALCON_IDE) += falconide.o
ide-obj-$(CONFIG_BLK_DEV_GAYLE) += gayle.o
ide-obj-$(CONFIG_BLK_DEV_Q40IDE) += q40ide.o
obj-$(CONFIG_BLK_DEV_HD) += hd.o
ide-obj-$(CONFIG_BLK_DEV_HPT34X) += hpt34x.o
ide-obj-$(CONFIG_BLK_DEV_HPT366) += hpt366.o
ide-obj-$(CONFIG_BLK_DEV_HT6560B) += ht6560b.o
......@@ -59,35 +65,9 @@ ide-obj-$(CONFIG_BLK_DEV_VIA82CXXX) += via82cxxx.o
ide-obj-$(CONFIG_PROC_FS) += ide-proc.o
export-objs := ide.o ide-features.o
list-multi := ide-mod.o ide-probe-mod.o
ide-mod-objs := $(export-objs) $(ide-obj-y)
ide-probe-mod-objs := ide-probe.o ide-geometry.o
obj-$(CONFIG_BLK_DEV_IDE) += ide-mod.o ide-probe-mod.o
obj-$(CONFIG_BLK_DEV_IDECS) += ide-cs.o
obj-$(CONFIG_BLK_DEV_IDEDISK) += ide-disk.o
obj-$(CONFIG_BLK_DEV_IDECD) += ide-cd.o
obj-$(CONFIG_BLK_DEV_IDETAPE) += ide-tape.o
obj-$(CONFIG_BLK_DEV_IDEFLOPPY) += ide-floppy.o
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Take multi-part drivers out of obj-y and put components in.
obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
# 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)))
MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m)))
MIX_OBJS := $(sort $(filter $(export-objs), $(int-m)))
include $(TOPDIR)/Rules.make
ide-mod.o: $(ide-mod-objs)
......
drivers/md/Makefile
View file @ 99234b21
......@@ -3,19 +3,11 @@
#
O_TARGET := mddev.o
SUB_DIRS :=
ALL_SUB_DIRS :=
MOD_SUB_DIRS :=
export-objs := md.o xor.o
list-multi := lvm-mod.o
lvm-mod-objs := lvm.o lvm-snap.o
obj-y :=
obj-m :=
obj-n :=
obj- :=
# 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
......@@ -30,13 +22,6 @@ 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.
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
lvm-mod.o: $(lvm-mod-objs)
......
drivers/misc/Makefile
View file @ 99234b21
......@@ -9,14 +9,7 @@
# parent makes..
#
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS)
O_TARGET := misc.o
M_OBJS :=
O_OBJS :=
OX_OBJS :=
include $(TOPDIR)/Rules.make
......
drivers/net/Makefile
View file @ 99234b21
......@@ -3,106 +3,37 @@
# Makefile for the Linux network (ethercard) device drivers.
#
O_OBJS :=
M_OBJS :=
MX_OBJS :=
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
SUB_DIRS :=
MOD_SUB_DIRS :=
MOD_IN_SUB_DIRS :=
ALL_SUB_DIRS := $(SUB_DIRS) fc hamradio irda pcmcia tokenring wan sk98lin \
arcnet skfp tulip appletalk
O_TARGET := net.o
# All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
export-objs := 8390.o arlan.o aironet4500_core.o aironet4500_card.o ppp_async.o \
ppp_generic.o slhc.o pppox.o
ifeq ($(CONFIG_PCMCIA),y)
SUB_DIRS += pcmcia
MOD_IN_SUB_DIRS += pcmcia
else
ifeq ($(CONFIG_PCMCIA),m)
MOD_IN_SUB_DIRS += pcmcia
endif
endif
ppp_generic.o slhc.o pppox.o auto_irq.o
ifeq ($(CONFIG_TULIP),y)
SUB_DIRS += tulip
obj-y += tulip/tulip.o
else
ifeq ($(CONFIG_TULIP),m)
MOD_SUB_DIRS += tulip
endif
endif
ifeq ($(CONFIG_IRDA),y)
SUB_DIRS += irda
MOD_IN_SUB_DIRS += irda
else
ifeq ($(CONFIG_IRDA),m)
MOD_IN_SUB_DIRS += irda
endif
endif
ifeq ($(CONFIG_TR),y)
SUB_DIRS += tokenring
MOD_IN_SUB_DIRS += tokenring
else
ifeq ($(CONFIG_TR),m)
MOD_IN_SUB_DIRS += tokenring
endif
endif
ifeq ($(CONFIG_WAN),y)
SUB_DIRS += wan
MOD_IN_SUB_DIRS += wan
else
ifeq ($(CONFIG_WAN),m)
MOD_IN_SUB_DIRS += wan
endif
endif
ifeq ($(CONFIG_NET_FC),y)
SUB_DIRS += fc
MOD_IN_SUB_DIRS += fc
else
ifeq ($(CONFIG_NET_FC),m)
MOD_IN_SUB_DIRS += fc
endif
endif
ifeq ($(CONFIG_ISDN_PPP),y)
obj-$(CONFIG_ISDN) += slhc.o
endif
ifeq ($(CONFIG_ARCNET),y)
SUB_DIRS += arcnet
MOD_IN_SUB_DIRS += arcnet
else
ifeq ($(CONFIG_ARCNET),m)
MOD_IN_SUB_DIRS += arcnet
endif
endif
ifeq ($(CONFIG_APPLETALK),y)
SUB_DIRS += appletalk
MOD_IN_SUB_DIRS += appletalk
else
ifeq ($(CONFIG_APPLETALK),m)
MOD_IN_SUB_DIRS += appletalk
endif
endif
subdir-$(CONFIG_PCMCIA) += pcmcia
subdir-$(CONFIG_TULIP) += tulip
subdir-$(CONFIG_IRDA) += irda
subdir-$(CONFIG_TR) += tokenring
subdir-$(CONFIG_WAN) += wan
subdir-$(CONFIG_NET_FC) += fc
subdir-$(CONFIG_ARCNET) += arcnet
subdir-$(CONFIG_APPLETALK) += appletalk
subdir-$(CONFIG_SK98LIN) += sk98lin
subdir-$(CONFIG_SKFP) += skfp
#
# link order important here
......@@ -140,21 +71,11 @@ obj-$(CONFIG_NATSEMI) += natsemi.o
obj-$(CONFIG_STNIC) += stnic.o 8390.o
ifeq ($(CONFIG_SK98LIN),y)
SUB_DIRS += sk98lin
obj-y += sk98lin/sk98lin.o
else
ifeq ($(CONFIG_SK98LIN),m)
MOD_IN_SUB_DIRS += sk98lin
endif
endif
ifeq ($(CONFIG_SKFP),y)
SUB_DIRS += skfp
obj-y += skfp/skfp.o
else
ifeq ($(CONFIG_SKFP),m)
MOD_IN_SUB_DIRS += skfp
endif
endif
obj-$(CONFIG_VIA_RHINE) += via-rhine.o
......@@ -281,33 +202,8 @@ obj-$(CONFIG_TUN) += tun.o
# HIPPI adapters
#
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
int-m := $(filter-out $(int-y), $(int-m))
# Take multi-part drivers out of obj-y and put components in.
obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
# 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)))
ifneq ($(ARCH),s390)
OX_OBJS += auto_irq.o
obj-y += auto_irq.o
endif
include $(TOPDIR)/Rules.make
......
drivers/net/appletalk/Makefile
View file @ 99234b21
......@@ -6,10 +6,6 @@
# unless it's something special (ie not a .c file).
#
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS)
obj-y :=
obj-n :=
obj-m :=
......@@ -21,10 +17,6 @@ obj-$(CONFIG_COPS) += cops.o
obj-$(CONFIG_LTPC) += ltpc.o
O_TARGET := appletalk.o
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)))
include $(TOPDIR)/Rules.make
drivers/net/arcnet/Makefile
View file @ 99234b21
......@@ -5,10 +5,6 @@
# unless it's something special (ie not a .c file).
#
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS)
obj-y :=
obj-n :=
obj-m :=
......@@ -27,9 +23,5 @@ obj-$(CONFIG_ARCNET_COM20020_ISA) += com20020-isa.o
obj-$(CONFIG_ARCNET_COM20020_PCI) += com20020-pci.o
L_TARGET := arcnet.a
L_OBJS := $(filter-out $(export-objs), $(obj-y))
LX_OBJS := $(filter $(export-objs), $(obj-y))
M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m)))
MX_OBJS := $(sort $(filter $(export-objs), $(obj-m)))
include $(TOPDIR)/Rules.make
drivers/net/fc/Makefile
View file @ 99234b21
......@@ -9,7 +9,4 @@ O_TARGET := fc.o
obj-$(CONFIG_IPHASE5526) += iph5526.o
O_OBJS := $(obj-y)
M_OBJS := $(obj-m)
include $(TOPDIR)/Rules.make
drivers/net/hamradio/Makefile
View file @ 99234b21
......@@ -11,10 +11,6 @@
#
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS) soundmodem
O_TARGET := hamradio.o
export-objs = hdlcdrv.o
......@@ -34,22 +30,10 @@ obj-$(CONFIG_BAYCOM_PAR) += baycom_par.o hdlcdrv.o
obj-$(CONFIG_BAYCOM_EPP) += baycom_epp.o hdlcdrv.o
obj-$(CONFIG_SOUNDMODEM) += hdlcdrv.o
subdir-$(CONFIG_SOUNDMODEM) += soundmodem
ifeq ($(CONFIG_SOUNDMODEM),y)
SUB_DIRS += soundmodem
O_OBJS += soundmodem/soundmodem.o
else
ifeq ($(CONFIG_SOUNDMODEM),m)
MOD_SUB_DIRS += soundmodem
endif
obj-y += soundmodem/soundmodem.o
endif
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
# 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)))
include $(TOPDIR)/Rules.make
drivers/net/hamradio/soundmodem/Makefile
View file @ 99234b21
......@@ -11,36 +11,18 @@
O_TARGET := soundmodem.o
O_OBJS := sm.o
ifeq ($(CONFIG_SOUNDMODEM_SBC),y)
O_OBJS += sm_sbc.o
endif
ifeq ($(CONFIG_SOUNDMODEM_WSS),y)
O_OBJS += sm_wss.o
endif
ifeq ($(CONFIG_SOUNDMODEM_AFSK1200),y)
O_OBJS += sm_afsk1200.o
endif
ifeq ($(CONFIG_SOUNDMODEM_AFSK2400_7),y)
O_OBJS += sm_afsk2400_7.o
endif
ifeq ($(CONFIG_SOUNDMODEM_AFSK2400_8),y)
O_OBJS += sm_afsk2400_8.o
endif
ifeq ($(CONFIG_SOUNDMODEM_AFSK2666),y)
O_OBJS += sm_afsk2666.o
endif
ifeq ($(CONFIG_SOUNDMODEM_HAPN4800),y)
O_OBJS += sm_hapn4800.o
endif
ifeq ($(CONFIG_SOUNDMODEM_PSK4800),y)
O_OBJS += sm_psk4800.o
endif
ifeq ($(CONFIG_SOUNDMODEM_FSK9600),y)
O_OBJS += sm_fsk9600.o
endif
M_OBJS := $(O_TARGET)
obj-y := sm.o
obj-$(CONFIG_SOUNDMODEM_SBC) += sm_sbc.o
obj-$(CONFIG_SOUNDMODEM_WSS) += sm_wss.o
obj-$(CONFIG_SOUNDMODEM_AFSK1200) += sm_afsk1200.o
obj-$(CONFIG_SOUNDMODEM_AFSK2400_7) += sm_afsk2400_7.o
obj-$(CONFIG_SOUNDMODEM_AFSK2400_8) += sm_afsk2400_8.o
obj-$(CONFIG_SOUNDMODEM_AFSK2666) += sm_afsk2666.o
obj-$(CONFIG_SOUNDMODEM_HAPN4800) += sm_hapn4800.o
obj-$(CONFIG_SOUNDMODEM_PSK4800) += sm_psk4800.o
obj-$(CONFIG_SOUNDMODEM_FSK9600) += sm_fsk9600.o
obj-m := $(O_TARGET)
all: all_targets
.PHONY: all
......
drivers/net/irda/Makefile
View file @ 99234b21
......@@ -5,10 +5,6 @@
# Rewritten to use lists instead of if-statements.
#
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS)
O_TARGET := irda.o
export-objs = irport.o
......@@ -27,14 +23,4 @@ obj-$(CONFIG_GIRBIL_DONGLE) += girbil.o
obj-$(CONFIG_LITELINK_DONGLE) += litelink.o
obj-$(CONFIG_OLD_BELKIN_DONGLE) += old_belkin.o
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
# 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)))
include $(TOPDIR)/Rules.make
drivers/net/pcmcia/Makefile
View file @ 99234b21
......@@ -4,10 +4,6 @@
# Makefile for the Linux PCMCIA network device drivers.
#
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS)
O_TARGET := pcmcia_net.o
obj-y :=
......@@ -39,11 +35,6 @@ obj-$(CONFIG_PCMCIA_XIRTULIP) += xircom_tulip_cb.o
obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o
O_OBJS := $(filter-out $(export-objs), $(obj-y))
OX_OBJS := $(filter $(export-objs), $(obj-y))
M_OBJS := $(filter-out $(export-objs), $(obj-m))
MX_OBJS := $(filter $(export-objs), $(obj-m))
include $(TOPDIR)/Rules.make
.ibmtr.o: ../tokenring/ibmtr.c
......
drivers/net/sk98lin/Makefile
View file @ 99234b21
......@@ -3,20 +3,12 @@
# Makefile for the SysKonnect SK-98xx device driver.
#
ifeq ($(CONFIG_SK98LIN),y)
O_TARGET := sk98lin.o
O_OBJS = skge.o skaddr.o skgehwt.o skgeinit.o skgepnmi.o skgesirq.o \
ski2c.o sklm80.o skqueue.o skrlmt.o sktimer.o skvpd.o \
skxmac2.o skcsum.o
else
ifeq ($(CONFIG_SK98LIN),m)
M_OBJS := sk98lin.o
O_TARGET := sk98lin.o
O_OBJS = skge.o skaddr.o skgehwt.o skgeinit.o skgepnmi.o skgesirq.o \
O_TARGET := sk98lin.o
obj-y := skge.o skaddr.o skgehwt.o skgeinit.o skgepnmi.o skgesirq.o \
ski2c.o sklm80.o skqueue.o skrlmt.o sktimer.o skvpd.o \
skxmac2.o skcsum.o
endif
endif
obj-m := $(O_TARGET)
# DBGDEF = \
# -DDEBUG
......
drivers/net/skfp/Makefile
View file @ 99234b21
......@@ -2,22 +2,12 @@
# Makefile for the SysKonnect FDDI PCI adapter driver
#
ifeq ($(CONFIG_SKFP),y)
O_TARGET := skfp.o
O_OBJS = skfddi.o hwmtm.o fplustm.o smt.o cfm.o \
O_TARGET := skfp.o
obj-y := skfddi.o hwmtm.o fplustm.o smt.o cfm.o \
ecm.o pcmplc.o pmf.o queue.o rmt.o \
smtdef.o smtinit.o smttimer.o srf.o lnkstat.o \
smtparse.o hwt.o drvfbi.o ess.o
else
ifeq ($(CONFIG_SKFP),m)
M_OBJS := skfp.o
O_TARGET := skfp.o
O_OBJS = skfddi.o hwmtm.o fplustm.o smt.o cfm.o \
ecm.o pcmplc.o pmf.o queue.o rmt.o \
smtdef.o smtinit.o smttimer.o srf.o lnkstat.o \
smtparse.o hwt.o drvfbi.o ess.o
endif
endif
obj-m := skfp.o
# NOTE:
# Compiling this driver produces some warnings (and some more are
......
drivers/net/tokenring/Makefile
View file @ 99234b21
......@@ -6,10 +6,6 @@
# unless it's something special (ie not a .c file).
#
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS)
obj-y :=
obj-n :=
obj-m :=
......@@ -26,9 +22,5 @@ obj-$(CONFIG_TMSPCI) += tmspci.o
obj-$(CONFIG_SMCTR) += smctr.o
L_TARGET := tr.a
L_OBJS := $(filter-out $(export-objs), $(obj-y))
LX_OBJS := $(filter $(export-objs), $(obj-y))
M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m)))
MX_OBJS := $(sort $(filter $(export-objs), $(obj-m)))
include $(TOPDIR)/Rules.make
drivers/net/tulip/Makefile
View file @ 99234b21
......@@ -8,7 +8,8 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := tulip.o
O_OBJS := 21142.o eeprom.o interrupt.o media.o pnic.o timer.o tulip_core.o
M_OBJS := $(O_TARGET)
obj-y := 21142.o eeprom.o interrupt.o media.o pnic.o timer.o tulip_core.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
drivers/net/wan/Makefile
View file @ 99234b21
......@@ -6,8 +6,6 @@
#
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS) lmc
O_TARGET := wan.o
......@@ -38,14 +36,10 @@ obj-$(CONFIG_LANMEDIA) += syncppp.o
obj-$(CONFIG_SYNCLINK_SYNCPPP) += syncppp.o
obj-$(CONFIG_X25_ASY) += x25_asy.o
subdir-$(CONFIG_LANMEDIA) += lmc
ifeq ($(CONFIG_LANMEDIA),y)
SUB_DIRS += lmc
MOD_IN_SUB_DIRS += lmc
obj-y += lmc/lmc.o
else
ifeq ($(CONFIG_LANMEDIA),m)
MOD_IN_SUB_DIRS += lmc
endif
endif
obj-$(CONFIG_DLCI) += dlci.o
......@@ -55,29 +49,6 @@ obj-$(CONFIG_CYCLADES_SYNC) += cycx_drv.o cyclomx.o
obj-$(CONFIG_LAPBETHER) += lapbether.o
obj-$(CONFIG_SBNI) += sbni.o
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
int-m := $(filter-out $(int-y), $(int-m))
# Take multi-part drivers out of obj-y and put components in.
obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
# 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)))
MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m)))
MIX_OBJS := $(sort $(filter $(export-objs), $(int-m)))
include $(TOPDIR)/Rules.make
wanpipe.o: $(wanpipe-objs)
......
drivers/net/wan/lmc/Makefile
View file @ 99234b21
......@@ -4,24 +4,11 @@
# Specifically the 1000,1200,5200,5245
#
ifeq ($(CONFIG_LANMEDIA),y)
O_TARGET := lmc.o
O_OBJS = lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o
else
ifeq ($(CONFIG_LANMEDIA),m)
M_OBJS := lmc.o
O_TARGET := lmc.o
O_OBJS = lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o
endif
endif
O_TARGET := lmc.o
#
# Base debugging and event log (doubles lmc.o size)
#
# DBGDEF = \
# -DDEBUG
obj-y := lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o
obj-m := lmc.o
#
# Like above except every packet gets echoed to KERN_DEBUG
# in hex
#
......
drivers/parport/Makefile
View file @ 99234b21
......@@ -9,7 +9,7 @@
# Rewritten to use lists instead of if-statements.
#
L_TARGET := parport.a
O_TARGET := driver.o
export-objs := init.o parport_pc.o
......@@ -28,24 +28,6 @@ obj-$(CONFIG_PARPORT_ATARI) += parport_atari.o
obj-$(CONFIG_PARPORT_SUNBPP) += parport_sunbpp.o
obj-$(CONFIG_PARPORT_GSC) += parport_gsc.o
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Take multi-part drivers out of obj-y and put components in.
obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
# Translate to Rules.make lists.
L_OBJS := $(filter-out $(export-objs), $(obj-y))
LX_OBJS := $(filter $(export-objs), $(obj-y))
M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m)))
MX_OBJS := $(sort $(filter $(export-objs), $(obj-m)))
MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m)))
MIX_OBJS := $(sort $(filter $(export-objs), $(int-m)))
include $(TOPDIR)/Rules.make
parport.o: $(parport-objs)
......
drivers/pci/Makefile
View file @ 99234b21
......@@ -9,22 +9,21 @@
# parent makefile.
#
L_TARGET := pci.a
O_TARGET := driver.o
# Nasty trick as we need to link files with no references from the outside.
O_TARGET := pci_core.o
L_OBJS := pci_core.o
O_OBJS := quirks.o
OX_OBJS := pci.o
export-objs := pci.o
ifdef CONFIG_PROC_FS
O_OBJS += proc.o
endif
obj-$(CONFIG_PCI) += pci.o quirks.o compat.o names.o setup-res.o
obj-$(CONFIG_PROC_FS) += proc.o
L_OBJS += compat.o names.o setup-res.o setup-bus.o setup-irq.o
#
# Some architectures use the generic PCI setup functions
#
obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o
obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o
ifndef CONFIG_X86
L_OBJS += syscall.o
obj-y += syscall.o
endif
include $(TOPDIR)/Rules.make
......
drivers/pcmcia/Makefile
View file @ 99234b21
......@@ -8,42 +8,40 @@
# Note 2! The CFLAGS definitions are now inherited from the
# parent makes..
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS)
O_TARGET := pcmcia.o
export-objs := ds.o cs.o cb_enabler.o yenta.o pci_socket.o
multi-list = pcmcia_core.o yenta_socket.o
yenta_socket-objs := pci_socket.o yenta.o
pcmcia_core-objs := cistpl.o rsrc_mgr.o bulkmem.o cs.o
ifeq ($(CONFIG_CARDBUS),y)
pcmcia_core-objs += cardbus.o
endif
ifeq ($(CONFIG_PCMCIA),y)
O_OBJS := cistpl.o rsrc_mgr.o bulkmem.o
OX_OBJS := ds.o cs.o
O_TARGET := pcmcia.o
obj-y := cistpl.o rsrc_mgr.o bulkmem.o ds.o cs.o
ifeq ($(CONFIG_CARDBUS),y)
O_OBJS += cardbus.o
OX_OBJS += cb_enabler.o yenta.o pci_socket.o
obj-y += cardbus.o cb_enabler.o yenta.o pci_socket.o
endif
ifeq ($(CONFIG_I82365),y)
O_OBJS += i82365.o
obj-y += i82365.o
endif
ifeq ($(CONFIG_TCIC),y)
O_OBJS += tcic.o
obj-y += tcic.o
endif
else
ifeq ($(CONFIG_PCMCIA),m)
M_OBJS := pcmcia_core.o
MX_OBJS := ds.o
MIX_OBJS := cs.o
CORE_OBJS := cistpl.o rsrc_mgr.o bulkmem.o cs.o
obj-m := pcmcia_core.o ds.o
ifeq ($(CONFIG_I82365),y)
M_OBJS += i82365.o
obj-m += i82365.o
endif
ifeq ($(CONFIG_TCIC),y)
M_OBJS += tcic.o
obj-m += tcic.o
endif
ifeq ($(CONFIG_CARDBUS),y)
M_OBJS += yenta_socket.o
CORE_OBJS += cardbus.o
CARDBUS_OBJS := pci_socket.o yenta.o
OX_OBJS += pci_socket.o yenta.o
MX_OBJS += cb_enabler.o
obj-m += yenta_socket.o cb_enabler.o
endif
endif
endif
......
drivers/pnp/Makefile
View file @ 99234b21
......@@ -8,30 +8,20 @@
# Note 2! The CFLAGS definitions are now inherited from the
# parent makes..
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS)
O_TARGET := pnp.o
PROC_OBJS :=
export-objs := isapnp.o
multi-objs := isa-pnp.o
ifdef CONFIG_PROC_FS
PROC_OBJS += isapnp_proc.o
endif
ifeq ($(CONFIG_ISAPNP),m)
M_OBJS := isa-pnp.o
MIX_OBJS := isapnp.o
MI_OBJS := quirks.o $(PROC_OBJS)
endif
ifeq ($(CONFIG_ISAPNP),y)
O_TARGET := pnp.o
OX_OBJS := isapnp.o
O_OBJS := quirks.o $(PROC_OBJS)
endif
isa-pnp-objs := isapnp.o quirks.o $(PROC_OBJS)
obj-$(CONFIG_ISAPNP) += isa-pnp.o
include $(TOPDIR)/Rules.make
isa-pnp.o: $(MIX_OBJS) $(MI_OBJS)
$(LD) $(LD_RFLAG) -r -o $@ $(MIX_OBJS) $(MI_OBJS)
isa-pnp.o: $(isa-pnp-objs)
$(LD) $(LD_RFLAG) -r -o $@ $(isa-pnp-objs)
drivers/pnp/quirks.c
View file @ 99234b21
......@@ -94,7 +94,7 @@ static void __init quirk_sb16audio_resources(struct pci_dev *dev)
changed = 1;
}
if(changed)
printk(KERN_INFO "ISAPnP: SB audio device quirk - increasing port range\n");
printk(KERN_INFO "isapnp: SB audio device quirk - increasing port range\n");
return;
}
......
drivers/scsi/Makefile
View file @ 99234b21
......@@ -129,24 +129,6 @@ sr_mod-objs := sr.o sr_ioctl.o sr_vendor.o
initio-objs := ini9100u.o i91uscsi.o
a100u2w-objs := inia100.o i60uscsi.o
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
int-m := $(filter-out $(int-y), $(int-m))
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)))
MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m)))
MIX_OBJS := $(sort $(filter $(export-objs), $(int-m)))
include $(TOPDIR)/Rules.make
......
drivers/scsi/pcmcia/Makefile
View file @ 99234b21
......@@ -4,10 +4,6 @@
# Makefile for the Linux PCMCIA SCSI drivers.
#
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS)
obj-y :=
obj-m :=
obj-n :=
......@@ -34,22 +30,6 @@ apa1480-objs := apa1480_stub.o aic7xxx.o
fdomain-objs := fdomain_stub.o fdomain.o
qlogic-objs := qlogic_stub.o qlogicfas.o
# Extract lists of the multi-part drivers.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Translate to Rules.make lists.
O_OBJS := $(filter-out $(export-objs), $(obj-y))
OX_OBJS := $(filter $(export-objs), $(obj-y))
M_OBJS := $(filter-out $(export-objs), $(obj-m))
MX_OBJS := $(filter $(export-objs), $(obj-m))
MI_OBJS := $(filter-out $(export-objs), $(int-m))
MIX_OBJS := $(filter $(export-objs), $(int-m))
include $(TOPDIR)/Rules.make
aha152x_cs.o: $(aha152x-objs)
......
drivers/sound/Makefile
View file @ 99234b21
......@@ -4,14 +4,6 @@
# Rewritten to use lists instead of if-statements.
# My subdirectories.
SUB_DIRS :=
MOD_SUB_DIRS :=
MOD_IN_SUB_DIRS :=
ALL_SUB_DIRS := $(SUB_DIRS) emu10k1
# All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
......@@ -20,17 +12,6 @@ export-objs := ad1848.o audio_syms.o midi_syms.o mpu401.o \
sound_core.o sound_syms.o uart401.o \
nm256_audio.o ac97.o ac97_codec.o
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
# Each configuration option enables a list of files.
obj-$(CONFIG_SOUND) += soundcore.o
......@@ -83,23 +64,16 @@ obj-$(CONFIG_SOUND_CS4281) += cs4281.o
obj-$(CONFIG_SOUND_MAESTRO) += maestro.o
obj-$(CONFIG_SOUND_TRIDENT) += trident.o ac97_codec.o
subdir-$(CONFIG_SOUND_EMU10K1) += emu10k1
ifeq ($(CONFIG_SOUND_EMU10K1),y)
SUB_DIRS += emu10k1
obj-y += emu10k1/emu10k1.o
else
ifeq ($(CONFIG_SOUND_EMU10K1),m)
MOD_SUB_DIRS += emu10k1
endif
endif
subdir-$(CONFIG_DMASOUND) += dmasound
ifeq ($(CONFIG_DMASOUND),y)
SUB_DIRS += dmasound
MOD_IN_SUB_DIRS += dmasound
obj-y += dmasound/dmasound.o
else
ifeq ($(CONFIG_DMASOUND),m)
MOD_IN_SUB_DIRS += dmasound
endif
endif
......@@ -124,39 +98,8 @@ vidc_mod-objs := vidc.o vidc_fill.o
wavefront-objs := wavfront.o wf_midi.o yss225.o
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
int-m := $(filter-out $(int-y), $(int-m))
# Take multi-part drivers out of obj-y and put components in.
obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
# Translate to Rules.make lists.
O_TARGET := sounddrivers.o
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)))
MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m)))
MIX_OBJS := $(sort $(filter $(export-objs), $(int-m)))
include $(TOPDIR)/Rules.make
......
drivers/sound/dmasound/Makefile
View file @ 99234b21
......@@ -7,12 +7,6 @@
#
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET :=
O_OBJS :=
OX_OBJS :=
M_OBJS :=
MX_OBJS :=
export-objs := dmasound_core.o
obj-$(CONFIG_DMASOUND_ATARI) += dmasound_core.o dmasound_atari.o
......@@ -20,17 +14,6 @@ obj-$(CONFIG_DMASOUND_AWACS) += dmasound_core.o dmasound_awacs.o
obj-$(CONFIG_DMASOUND_PAULA) += dmasound_core.o dmasound_paula.o
obj-$(CONFIG_DMASOUND_Q40) += dmasound_core.o dmasound_q40.o
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
# 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)))
ifeq ($(CONFIG_DMASOUND),y)
O_TARGET = dmasound.o
endif
......
drivers/sound/emu10k1/Makefile
View file @ 99234b21
......@@ -2,20 +2,12 @@
#
# 12 Apr 2000 Rui Sousa
ifeq ($(CONFIG_SOUND_EMU10K1),y)
O_TARGET := emu10k1.o
O_OBJS = audio.o cardmi.o cardmo.o cardwi.o cardwo.o ecard.o \
emuadxmg.o hwaccess.o irqmgr.o main.o midi.o mixer.o \
recmgr.o timer.o voicemgr.o
else
ifeq ($(CONFIG_SOUND_EMU10K1),m)
M_OBJS := emu10k1.o
O_TARGET := emu10k1.o
O_OBJS = audio.o cardmi.o cardmo.o cardwi.o cardwo.o ecard.o \
O_TARGET := emu10k1.o
obj-y := audio.o cardmi.o cardmo.o cardwi.o cardwo.o ecard.o \
emuadxmg.o hwaccess.o irqmgr.o main.o midi.o mixer.o \
recmgr.o timer.o voicemgr.o
endif
endif
obj-m := $(O_TARGET)
ifdef DEBUG
EXTRA_CFLAGS += -DEMU10K1_DEBUG
......
drivers/usb/Makefile
View file @ 99234b21
......@@ -4,15 +4,9 @@
# Subdirs.
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS) serial storage
# The target object and module list name.
O_TARGET := usbdrv.o
M_OBJS :=
O_OBJS :=
# Objects that export symbols.
......@@ -68,35 +62,17 @@ obj-$(CONFIG_USB_NET1080) += net1080.o
# Object files in subdirectories
subdir-$(CONFIG_USB_SERIAL) += serial
subdir-$(CONFIG_USB_STORAGE) += storage
ifeq ($(CONFIG_USB_SERIAL),y)
SUB_DIRS += serial
obj-y += serial/usb-serial.o
else
ifeq ($(CONFIG_USB_SERIAL),m)
MOD_SUB_DIRS += serial
endif
endif
ifeq ($(CONFIG_USB_STORAGE),y)
SUB_DIRS += storage
obj-y += storage/storage.o
else
ifeq ($(CONFIG_USB_STORAGE),m)
MOD_SUB_DIRS += storage
endif
endif
# Translate to Rules.make lists.
multi-used := $(filter $(list-multi), $(obj-y) $(obj-m))
multi-objs := $(foreach m, $(multi-used), $($(basename $(m))-objs))
active-objs := $(sort $(multi-objs) $(obj-y) $(obj-m))
O_OBJS := $(obj-y)
M_OBJS := $(obj-m)
MIX_OBJS := $(filter $(export-objs), $(active-objs))
# The global Rules.make.
include $(TOPDIR)/Rules.make
# Link rules for multi-part drivers.
......
drivers/usb/serial/Makefile
View file @ 99234b21
......@@ -3,16 +3,9 @@
#
O_TARGET := usb-serial.o
M_OBJS :=
O_OBJS :=
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
obj-$(CONFIG_USB_SERIAL) += usbserial.o
obj-$(CONFIG_USB_SERIAL_VISOR) += visor.o
obj-$(CONFIG_USB_SERIAL_WHITEHEAT) += whiteheat.o
......@@ -28,12 +21,5 @@ obj-$(CONFIG_USB_SERIAL_MCT_U232) += mct_u232.o
# Objects that export symbols.
export-objs := usbserial.o
# Translate to Rules.make lists.
O_OBJS := $(sort $(filter-out $(export-objs), $(obj-y)))
OX_OBJS := $(sort $(filter $(export-objs), $(obj-y)))
M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m)))
MX_OBJS := $(sort $(filter $(export-objs), $(obj-m)))
include $(TOPDIR)/Rules.make
drivers/usb/storage/Makefile
View file @ 99234b21
......@@ -23,21 +23,6 @@ usb-storage-obj-$(CONFIG_USB_STORAGE_DPCM) += dpcm.o
usb-storage-objs := scsiglue.o protocol.o transport.o usb.o \
initializers.o $(usb-storage-obj-y)
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Take multi-part drivers out of obj-y and put components in.
obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
# Translate to Rules.make lists.
O_OBJS := $(obj-y)
M_OBJS := $(obj-m)
MI_OBJS := $(int-m)
include $(TOPDIR)/Rules.make
usb-storage.o: $(usb-storage-objs)
......
drivers/video/Makefile
View file @ 99234b21
......@@ -2,11 +2,6 @@
# 5 Aug 1999, James Simmons, <mailto:jsimmons@edgeglobal.com>
# Rewritten to use lists instead of if-statements.
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
MOD_IN_SUB_DIRS :=
ALL_SUB_DIRS := $(SUB_DIRS) matrox riva
O_TARGET := video.o
O_OBJS :=
M_OBJS :=
......@@ -22,12 +17,6 @@ export-objs := fbmem.o fbcmap.o fbcon.o fbmon.o modedb.o \
fbcon-cfb8.o fbcon-mac.o fbcon-mfb.o fbcon-vga8-planes.o \
matrox/matroxfb.o cyber2000fb.o fbcon-hga.o
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
# Each configuration option enables a list of files.
obj-$(CONFIG_DUMMY_CONSOLE) += dummycon.o
......@@ -90,35 +79,21 @@ obj-$(CONFIG_FB_CGFOURTEEN) += cgfourteenfb.o sbusfb.o
obj-$(CONFIG_FB_P9100) += p9100fb.o sbusfb.o
obj-$(CONFIG_FB_LEO) += leofb.o sbusfb.o
subdir-$(CONFIG_FB_MATROX) += matrox
ifeq ($(CONFIG_FB_MATROX),y)
SUB_DIRS += matrox
obj-y += matrox/matrox.o
MOD_SUB_DIRS += matrox
else
ifeq ($(CONFIG_FB_MATROX),m)
MOD_SUB_DIRS += matrox
endif
endif
subdir-$(CONFIG_FB_RIVA) += riva
ifeq ($(CONFIG_FB_RIVA),y)
SUB_DIRS += riva
obj-y += riva/rivafb.o
else
ifeq ($(CONFIG_FB_RIVA),m)
MOD_SUB_DIRS += riva
endif
endif
subdir-$(CONFIG_FB_SIS) += sis
ifeq ($(CONFIG_FB_SIS),y)
SUB_DIRS += sis
obj-y += sis/sisfb.o
else
ifeq ($(CONFIG_FB_SIS),m)
MOD_SUB_DIRS += sis
endif
endif
obj-$(CONFIG_FB_SUN3) += sun3fb.o
obj-$(CONFIG_FB_BWTWO) += bwtwofb.o
obj-$(CONFIG_FB_HGA) += hgafb.o
......@@ -145,30 +120,6 @@ obj-$(CONFIG_FBCON_MFB) += fbcon-mfb.o
obj-$(CONFIG_FBCON_VGA) += fbcon-vga.o
obj-$(CONFIG_FBCON_HGA) += fbcon-hga.o
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
int-m := $(filter-out $(int-y), $(int-m))
# Take multi-part drivers out of obj-y and put components in.
obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
# 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)))
include $(TOPDIR)/Rules.make
clean:
......
drivers/video/matrox/Makefile
View file @ 99234b21
......@@ -2,56 +2,19 @@
# 5 Aug 1999, James Simmons, <mailto:jsimmons@edgeglobal.com>
# Rewritten to use lists instead of if-statements.
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
MOD_IN_SUB_DIRS :=
ALL_SUB_DIRS := $(SUB_DIRS)
O_TARGET := matrox.o
O_OBJS :=
M_OBJS :=
# All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
export-objs := matroxfb_base.o matroxfb_accel.o matroxfb_DAC1064.o matroxfb_Ti3026.o matroxfb_misc.o
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
# Each configuration option enables a list of files.
obj-$(CONFIG_FB_MATROX) += matroxfb_base.o matroxfb_accel.o matroxfb_DAC1064.o matroxfb_Ti3026.o matroxfb_misc.o
obj-$(CONFIG_FB_MATROX_I2C) += i2c-matroxfb.o
obj-$(CONFIG_FB_MATROX_MAVEN) += matroxfb_maven.o matroxfb_crtc2.o
# Extract lists of the multi-part drivers.
# The 'int-*' lists are the intermediate files used to build the multi's.
multi-y := $(filter $(list-multi), $(obj-y))
multi-m := $(filter $(list-multi), $(obj-m))
int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
int-m := $(filter-out $(int-y), $(int-m))
# Take multi-part drivers out of obj-y and put components in.
obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
# 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)))
include $(TOPDIR)/Rules.make
clean:
......
drivers/video/riva/Makefile
View file @ 99234b21
......@@ -8,7 +8,8 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := rivafb.o
O_OBJS := fbdev.o riva_hw.o
M_OBJS := $(O_TARGET)
obj-y := fbdev.o riva_hw.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
drivers/video/sis/Makefile
View file @ 99234b21
......@@ -3,9 +3,9 @@
#
O_TARGET := sisfb.o
O_OBJS := sis_main.o sis_300.o sis_301.o
#O_OBJS := sis_300.o
M_OBJS := $(O_TARGET)
obj-y := sis_main.o sis_300.o sis_301.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
......
fs/Makefile
View file @ 99234b21
......@@ -75,17 +75,4 @@ obj-$(CONFIG_BINFMT_ELF) += binfmt_elf.o
obj-y += $(join $(subdir-y),$(subdir-y:%=/%.o))
# Subdirectories that should be entered when MAKING_MODULES=1, even if set to 'y'.
both-m := $(filter $(mod-subdirs), $(subdir-y))
# 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)))
SUB_DIRS := $(subdir-y)
MOD_SUB_DIRS := $(sort $(subdir-m) $(both-m))
ALL_SUB_DIRS := $(sort $(subdir-y) $(subdir-m) $(subdir-n) $(subdir-))
include $(TOPDIR)/Rules.make
fs/adfs/Makefile
View file @ 99234b21
......@@ -8,7 +8,8 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := adfs.o
O_OBJS := dir.o dir_f.o dir_fplus.o file.o inode.o map.o super.o
M_OBJS := $(O_TARGET)
obj-y := dir.o dir_f.o dir_fplus.o file.o inode.o map.o super.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/affs/Makefile
View file @ 99234b21
......@@ -8,7 +8,8 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := affs.o
O_OBJS := super.o namei.o inode.o file.o dir.o amigaffs.o bitmap.o symlink.o
M_OBJS := $(O_TARGET)
obj-y := super.o namei.o inode.o file.o dir.o amigaffs.o bitmap.o symlink.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/autofs/Makefile
View file @ 99234b21
......@@ -5,31 +5,8 @@
#
O_TARGET := autofs.o
O_OBJS := dir.o dirhash.o init.o inode.o root.o symlink.o waitq.o
M_OBJS := $(O_TARGET)
obj-y := dir.o dirhash.o init.o inode.o root.o symlink.o waitq.o
obj-m := $(O_TARGET)
ifdef TOPDIR
#
# Part of the kernel code
#
include $(TOPDIR)/Rules.make
else
#
# Standalone (handy for development)
#
include ../Makefile.rules
CFLAGS += -D__KERNEL__ -DMODULE $(KFLAGS) -I../include -I$(KINCLUDE) $(MODFLAGS)
all: $(O_TARGET)
$(O_TARGET): $(O_OBJS)
$(LD) -r -o $(O_TARGET) $(O_OBJS)
install: $(O_TARGET)
install -c $(O_TARGET) /lib/modules/`uname -r`/fs
clean:
rm -f *.o *.s
endif
fs/autofs4/Makefile
View file @ 99234b21
......@@ -5,31 +5,9 @@
#
O_TARGET := autofs4.o
O_OBJS := init.o inode.o root.o symlink.o waitq.o expire.o
M_OBJS := $(O_TARGET)
obj-y := init.o inode.o root.o symlink.o waitq.o expire.o
ifdef TOPDIR
#
# Part of the kernel code
#
include $(TOPDIR)/Rules.make
else
#
# Standalone (handy for development)
#
include ../Makefile.rules
obj-m := $(O_TARGET)
CFLAGS += -D__KERNEL__ -DMODULE $(KFLAGS) -I../include -I$(KINCLUDE) $(MODFLAGS)
all: $(O_TARGET)
$(O_TARGET): $(O_OBJS)
$(LD) -r -o $(O_TARGET) $(O_OBJS)
install: $(O_TARGET)
install -c $(O_TARGET) /lib/modules/`uname -r`/fs
clean:
rm -f *.o *.s
endif
include $(TOPDIR)/Rules.make
fs/bfs/Makefile
View file @ 99234b21
......@@ -8,7 +8,8 @@
# Note 2! The CFLAGS definitions are now in the main Makefile...
O_TARGET := bfs.o
O_OBJS := inode.o file.o dir.o
M_OBJS := $(O_TARGET)
obj-y := inode.o file.o dir.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/buffer.c
View file @ 99234b21
......@@ -758,13 +758,6 @@ void init_buffer(struct buffer_head *bh, bh_end_io_t *handler, void *private)
bh->b_private = private;
}
static void end_buffer_io_bad(struct buffer_head *bh, int uptodate)
{
mark_buffer_uptodate(bh, uptodate);
unlock_buffer(bh);
BUG();
}
static void end_buffer_io_async(struct buffer_head * bh, int uptodate)
{
static spinlock_t page_uptodate_lock = SPIN_LOCK_UNLOCKED;
......@@ -995,7 +988,7 @@ struct buffer_head * getblk(kdev_t dev, int block, int size)
* and it is clean.
*/
if (bh) {
init_buffer(bh, end_buffer_io_bad, NULL);
init_buffer(bh, NULL, NULL);
bh->b_dev = dev;
bh->b_blocknr = block;
bh->b_state = 1 << BH_Mapped;
......@@ -1305,7 +1298,7 @@ static struct buffer_head * create_buffers(struct page * page, unsigned long siz
set_bh_page(bh, page, offset);
bh->b_list = BUF_CLEAN;
bh->b_end_io = end_buffer_io_bad;
bh->b_end_io = NULL;
}
return head;
/*
......@@ -1426,7 +1419,7 @@ static void create_empty_buffers(struct page *page, kdev_t dev, unsigned long bl
do {
bh->b_dev = dev;
bh->b_blocknr = 0;
bh->b_end_io = end_buffer_io_bad;
bh->b_end_io = NULL;
tail = bh;
bh = bh->b_this_page;
} while (bh);
......
fs/coda/Makefile
View file @ 99234b21
......@@ -3,9 +3,10 @@
#
O_TARGET := coda.o
O_OBJS := psdev.o cache.o cnode.o inode.o dir.o file.o upcall.o coda_linux.o\
symlink.o pioctl.o sysctl.o
M_OBJS := $(O_TARGET)
obj-y := psdev.o cache.o cnode.o inode.o dir.o file.o upcall.o coda_linux.o\
symlink.o pioctl.o sysctl.o
obj-m := $(O_TARGET)
# If you want debugging output, please uncomment the following line.
......
fs/cramfs/Makefile
View file @ 99234b21
......@@ -4,9 +4,9 @@
O_TARGET := cramfs.o
O_OBJS := inode.o uncompress.o inflate/zlib.o
obj-y := inode.o uncompress.o inflate/zlib.o
M_OBJS := $(O_TARGET)
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
......
fs/cramfs/inflate/Makefile
View file @ 99234b21
......@@ -28,7 +28,7 @@
O_TARGET := zlib.o
O_OBJS := adler32.o infblock.o infcodes.o inffast.o inflate.o \
inftrees.o infutil.o uncompr.o
obj-y := adler32.o infblock.o infcodes.o inffast.o inflate.o \
inftrees.o infutil.o uncompr.o
include $(TOPDIR)/Rules.make
fs/devfs/Makefile
View file @ 99234b21
......@@ -8,7 +8,10 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := devfs.o
OX_OBJS := base.o util.o
export-objs := base.o util.o
obj-y := base.o util.o
# Special case to support building documentation
ifndef TOPDIR
......
fs/devpts/Makefile
View file @ 99234b21
......@@ -3,8 +3,9 @@
#
O_TARGET := devpts.o
O_OBJS := root.o inode.o
M_OBJS := $(O_TARGET)
obj-y := root.o inode.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/efs/Makefile
View file @ 99234b21
......@@ -8,7 +8,8 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := efs.o
O_OBJS := super.o inode.o namei.o dir.o file.o symlink.o
M_OBJS := $(O_TARGET)
obj-y := super.o inode.o namei.o dir.o file.o symlink.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/ext2/Makefile
View file @ 99234b21
......@@ -8,8 +8,9 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := ext2.o
O_OBJS := acl.o balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
obj-y := acl.o balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
ioctl.o namei.o super.o symlink.o
M_OBJS := $(O_TARGET)
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/fat/Makefile
View file @ 99234b21
......@@ -8,8 +8,10 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := fat.o
O_OBJS := buffer.o cache.o dir.o file.o inode.o misc.o tables.o cvf.o
OX_OBJS := fatfs_syms.o
M_OBJS := $(O_TARGET)
export-objs := fatfs_syms.o
obj-y := buffer.o cache.o dir.o file.o inode.o misc.o tables.o cvf.o fatfs_syms.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/hfs/Makefile
View file @ 99234b21
......@@ -8,11 +8,12 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := hfs.o
O_OBJS := balloc.o bdelete.o bfind.o bins_del.o binsert.o bitmap.o bitops.o \
obj-y := balloc.o bdelete.o bfind.o bins_del.o binsert.o bitmap.o bitops.o \
bnode.o brec.o btree.o catalog.o dir.o dir_cap.o dir_dbl.o \
dir_nat.o extent.o file.o file_cap.o file_hdr.o inode.o mdb.o \
part_tbl.o string.o super.o sysdep.o trans.o version.o
M_OBJS := $(O_TARGET)
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/hpfs/Makefile
View file @ 99234b21
O_TARGET := hpfs.o
O_OBJS := alloc.o anode.o buffer.o dentry.o dir.o dnode.o ea.o file.o inode.o map.o name.o namei.o super.o
M_OBJS := $(O_TARGET)
obj-y := alloc.o anode.o buffer.o dentry.o dir.o dnode.o ea.o file.o inode.o map.o name.o namei.o super.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/isofs/Makefile
View file @ 99234b21
......@@ -8,12 +8,10 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := isofs.o
O_OBJS := namei.o inode.o dir.o util.o rock.o
ifdef CONFIG_JOLIET
O_OBJS += joliet.o
endif
obj-y := namei.o inode.o dir.o util.o rock.o
obj-$(CONFIG_JOLIET) += joliet.o
M_OBJS := $(O_TARGET)
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/jffs/Makefile
View file @ 99234b21
......@@ -30,7 +30,7 @@ endif
endif
O_TARGET := jffs.o
M_OBJS := $(O_TARGET)
O_OBJS := jffs_fm.o intrep.o $(INODE_O)
obj-m := $(O_TARGET)
obj-y := jffs_fm.o intrep.o $(INODE_O)
include $(TOPDIR)/Rules.make
fs/lockd/Makefile
View file @ 99234b21
......@@ -8,14 +8,14 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := lockd.o
O_OBJS := clntlock.o clntproc.o host.o svc.o svclock.o svcshare.o \
svcproc.o svcsubs.o mon.o xdr.o
ifdef CONFIG_LOCKD_V4
O_OBJS += xdr4.o svc4proc.o
endif
export-objs := lockd_syms.o
OX_OBJS := lockd_syms.o
M_OBJS := $(O_TARGET)
obj-y := clntlock.o clntproc.o host.o svc.o svclock.o svcshare.o \
svcproc.o svcsubs.o mon.o xdr.o lockd_syms.o
obj-$(CONFIG_LOCKD_V4) += xdr4.o svc4proc.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/minix/Makefile
View file @ 99234b21
......@@ -8,7 +8,8 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := minix.o
O_OBJS := bitmap.o itree_v1.o itree_v2.o namei.o inode.o file.o dir.o
M_OBJS := $(O_TARGET)
obj-y := bitmap.o itree_v1.o itree_v2.o namei.o inode.o file.o dir.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/msdos/Makefile
View file @ 99234b21
......@@ -8,8 +8,10 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := msdos.o
O_OBJS := namei.o
OX_OBJS := msdosfs_syms.o
M_OBJS := $(O_TARGET)
export-objs := msdosfs_syms.o
obj-y := namei.o msdosfs_syms.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/ncpfs/Makefile
View file @ 99234b21
......@@ -8,9 +8,10 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := ncpfs.o
O_OBJS := dir.o file.o inode.o ioctl.o mmap.o ncplib_kernel.o sock.o \
obj-y := dir.o file.o inode.o ioctl.o mmap.o ncplib_kernel.o sock.o \
symlink.o ncpsign_kernel.o
M_OBJS := $(O_TARGET)
obj-m := $(O_TARGET)
# If you want debugging output, please uncomment the following line
# EXTRA_CFLAGS += -DDEBUG_NCP=1
......
fs/nfs/Makefile
View file @ 99234b21
......@@ -8,16 +8,13 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := nfs.o
O_OBJS := inode.o file.o read.o write.o dir.o symlink.o proc.o \
obj-y := inode.o file.o read.o write.o dir.o symlink.o proc.o \
nfs2xdr.o flushd.o unlink.o
ifdef CONFIG_ROOT_NFS
O_OBJS += nfsroot.o mount_clnt.o
endif
ifdef CONFIG_NFS_V3
O_OBJS += nfs3proc.o nfs3xdr.o
endif
obj-$(CONFIG_ROOT_NFS) += nfsroot.o mount_clnt.o
obj-$(CONFIG_NFS_V3) += nfs3proc.o nfs3xdr.o
M_OBJS := $(O_TARGET)
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/nfsd/Makefile
View file @ 99234b21
......@@ -8,13 +8,13 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := nfsd.o
O_OBJS := nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.o \
obj-y := nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.o \
export.o auth.o lockd.o nfscache.o nfsxdr.o \
stats.o
ifdef CONFIG_NFSD_V3
O_OBJS += nfs3proc.o nfs3xdr.o
endif
M_OBJS := $(O_TARGET)
obj-$(CONFIG_NFSD_V3) += nfs3proc.o nfs3xdr.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/nls/Makefile
View file @ 99234b21
......@@ -52,8 +52,7 @@ obj-$(CONFIG_NLS_KOI8_R) += nls_koi8-r.o
obj-$(CONFIG_NLS_ABC) += nls_abc.o
obj-$(CONFIG_NLS_UTF8) += nls_utf8.o
OX_OBJS = $(obj-y)
M_OBJS = $(obj-m)
export-objs = $(obj-y)
O_TARGET = nls.o
......
fs/ntfs/Makefile
View file @ 99234b21
# Rules for making the NTFS driver
O_TARGET := ntfs.o
O_OBJS := fs.o sysctl.o support.o util.o inode.o dir.o super.o attr.o
M_OBJS := $(O_TARGET)
obj-y := fs.o sysctl.o support.o util.o inode.o dir.o super.o attr.o
obj-m := $(O_TARGET)
EXTRA_CFLAGS = -DNTFS_IN_LINUX_KERNEL -DNTFS_VERSION=\"000607\"
include $(TOPDIR)/Rules.make
......
fs/openpromfs/Makefile
View file @ 99234b21
......@@ -8,7 +8,8 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := openpromfs.o
O_OBJS := inode.o
M_OBJS := $(O_TARGET)
obj-y := inode.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/partitions/Makefile
View file @ 99234b21
......@@ -8,7 +8,10 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := partitions.o
OX_OBJS := check.o
export-objs := check.o
obj-y := check.o
obj-$(CONFIG_ACORN_PARTITION) += acorn.o
obj-$(CONFIG_AMIGA_PARTITION) += amiga.o
......@@ -21,8 +24,5 @@ obj-$(CONFIG_SUN_PARTITION) += sun.o
obj-$(CONFIG_ULTRIX_PARTITION) += ultrix.o
obj-$(CONFIG_IBM_PARTITION) += ibm.o
O_OBJS += $(obj-y)
M_OBJS += $(obj-m)
include $(TOPDIR)/Rules.make
fs/proc/Makefile
View file @ 99234b21
......@@ -8,13 +8,14 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := proc.o
O_OBJS := inode.o root.o base.o generic.o array.o \
kmsg.o proc_tty.o proc_misc.o kcore.o
OX_OBJS := procfs_syms.o
M_OBJS :=
export-objs := procfs_syms.o
obj-y := inode.o root.o base.o generic.o array.o \
kmsg.o proc_tty.o proc_misc.o kcore.o procfs_syms.o
ifeq ($(CONFIG_PROC_DEVICETREE),y)
O_OBJS += proc_devtree.o
obj-y += proc_devtree.o
endif
include $(TOPDIR)/Rules.make
fs/qnx4/Makefile
View file @ 99234b21
......@@ -8,7 +8,8 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := qnx4.o
O_OBJS := inode.o dir.o namei.o file.o bitmap.o truncate.o fsync.o
M_OBJS := $(O_TARGET)
obj-y := inode.o dir.o namei.o file.o bitmap.o truncate.o fsync.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/ramfs/Makefile
View file @ 99234b21
......@@ -4,8 +4,7 @@
O_TARGET := ramfs.o
O_OBJS := inode.o
M_OBJS := $(O_TARGET)
obj-y := inode.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/romfs/Makefile
View file @ 99234b21
......@@ -8,7 +8,8 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := romfs.o
O_OBJS := inode.o
M_OBJS := $(O_TARGET)
obj-y := inode.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/smbfs/Makefile
View file @ 99234b21
......@@ -8,8 +8,9 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := smbfs.o
O_OBJS := proc.o dir.o cache.o sock.o inode.o file.o ioctl.o getopt.o
M_OBJS := $(O_TARGET)
obj-y := proc.o dir.o cache.o sock.o inode.o file.o ioctl.o getopt.o
obj-m := $(O_TARGET)
# If you want debugging output, you may add these flags to the EXTRA_CFLAGS
# SMBFS_PARANOIA should normally be enabled.
......
fs/sysv/Makefile
View file @ 99234b21
......@@ -8,7 +8,8 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := sysv.o
O_OBJS := ialloc.o balloc.o inode.o file.o dir.o namei.o fsync.o truncate.o
M_OBJS := $(O_TARGET)
obj-y := ialloc.o balloc.o inode.o file.o dir.o namei.o fsync.o truncate.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/udf/Makefile
View file @ 99234b21
......@@ -8,9 +8,10 @@
# Note 2! The CFLAGS definitions are now in the main makefile..
O_TARGET := udf.o
O_OBJS := balloc.o dir.o file.o ialloc.o inode.o lowlevel.o namei.o \
obj-y := balloc.o dir.o file.o ialloc.o inode.o lowlevel.o namei.o \
partition.o super.o truncate.o symlink.o fsync.o \
crc.o directory.o misc.o udftime.o unicode.o
M_OBJS := $(O_TARGET)
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/ufs/Makefile
View file @ 99234b21
......@@ -8,8 +8,9 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := ufs.o
O_OBJS := balloc.o cylinder.o dir.o file.o ialloc.o inode.o \
obj-y := balloc.o cylinder.o dir.o file.o ialloc.o inode.o \
namei.o super.o symlink.o truncate.o util.o
M_OBJS := $(O_TARGET)
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
fs/umsdos/Makefile
View file @ 99234b21
......@@ -8,9 +8,9 @@
# Note 2: the CFLAGS definitions are now in the main makefile.
O_TARGET := umsdos.o
O_OBJS := dir.o inode.o ioctl.o mangle.o namei.o rdir.o emd.o
obj-y := dir.o inode.o ioctl.o mangle.o namei.o rdir.o emd.o
M_OBJS := $(O_TARGET)
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
......
fs/vfat/Makefile
View file @ 99234b21
......@@ -8,8 +8,10 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := vfat.o
O_OBJS := namei.o
OX_OBJS := vfatfs_syms.o
M_OBJS := $(O_TARGET)
export-objs := vfatfs_syms.o
obj-y := namei.o vfatfs_syms.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
include/asm-i386/pgtable.h
View file @ 99234b21
......@@ -284,7 +284,7 @@ static inline pte_t pte_mkwrite(pte_t pte) { (pte).pte_low |= _PAGE_RW; return p
static inline int ptep_test_and_clear_dirty(pte_t *ptep) { return test_and_clear_bit(_PAGE_BIT_DIRTY, ptep); }
static inline int ptep_test_and_clear_young(pte_t *ptep) { return test_and_clear_bit(_PAGE_BIT_ACCESSED, ptep); }
static inline void ptep_set_wrprotect(pte_t *ptep) { clear_bit(_PAGE_BIT_RW, ptep); }
static inline void ptep_mkdirty(pte_t *ptep) { set_bit(_PAGE_BIT_RW, ptep); }
static inline void ptep_mkdirty(pte_t *ptep) { set_bit(_PAGE_BIT_DIRTY, ptep); }
/*
* Conversion functions: convert a page and protection to a page entry,
......
include/asm-i386/uaccess.h
View file @ 99234b21
......@@ -511,7 +511,7 @@ do { \
" stosb\n" \
" popl %%eax\n" \
" incl %0\n" \
" jmp 2b\n" \
" jmp 3b\n" \
".previous\n" \
".section __ex_table,\"a\"\n" \
" .align 4\n" \
......
ipc/Makefile
View file @ 99234b21
......@@ -8,10 +8,9 @@
# Note 2! The CFLAGS definition is now in the main makefile...
O_TARGET := ipc.o
O_OBJS := util.o
ifdef CONFIG_SYSVIPC
O_OBJS += msg.o sem.o shm.o
endif
obj-y := util.o
obj-$(CONFIG_SYSVIPC) += msg.o sem.o shm.o
include $(TOPDIR)/Rules.make
kernel/Makefile
View file @ 99234b21
......@@ -8,23 +8,17 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := kernel.o
O_OBJS = sched.o dma.o fork.o exec_domain.o panic.o printk.o \
module.o exit.o itimer.o info.o time.o softirq.o resource.o \
sysctl.o acct.o capability.o ptrace.o timer.o user.o
OX_OBJS += signal.o sys.o kmod.o context.o
ifeq ($(CONFIG_UID16),y)
O_OBJS += uid16.o
endif
export-objs = signal.o sys.o kmod.o context.o
ifeq ($(CONFIG_MODULES),y)
OX_OBJS += ksyms.o
endif
obj-y = sched.o dma.o fork.o exec_domain.o panic.o printk.o \
module.o exit.o itimer.o info.o time.o softirq.o resource.o \
sysctl.o acct.o capability.o ptrace.o timer.o user.o \
signal.o sys.o kmod.o context.o
ifeq ($(CONFIG_PM),y)
OX_OBJS += pm.o
endif
obj-$(CONFIG_UID16) += uid16.o
obj-$(CONFIG_MODULES) += ksyms.o
obj-$(CONFIG_PM) += pm.o
ifneq ($(CONFIG_IA64),y)
# According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
......
lib/Makefile
View file @ 99234b21
......@@ -7,11 +7,13 @@
#
L_TARGET := lib.a
L_OBJS := errno.o ctype.o string.o vsprintf.o brlock.o
LX_OBJS := cmdline.o
export-objs := cmdline.o
obj-y := errno.o ctype.o string.o vsprintf.o brlock.o cmdline.o
ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
L_OBJS += dec_and_lock.o
obj-y += dec_and_lock.o
endif
include $(TOPDIR)/Rules.make
mm/Makefile
View file @ 99234b21
......@@ -8,12 +8,11 @@
# Note 2! The CFLAGS definition is now in the main makefile...
O_TARGET := mm.o
O_OBJS := memory.o mmap.o filemap.o mprotect.o mlock.o mremap.o \
obj-y := memory.o mmap.o filemap.o mprotect.o mlock.o mremap.o \
vmalloc.o slab.o bootmem.o swap.o vmscan.o page_io.o \
page_alloc.o swap_state.o swapfile.o numa.o oom_kill.o
ifeq ($(CONFIG_HIGHMEM),y)
O_OBJS += highmem.o
endif
obj-$(CONFIG_HIGHMEM) += highmem.o
include $(TOPDIR)/Rules.make
mm/swapfile.c
View file @ 99234b21
......@@ -370,6 +370,7 @@ static int try_to_unuse(unsigned int type)
swap_free(entry);
return -ENOMEM;
}
delete_from_swap_cache(page);
read_lock(&tasklist_lock);
for_each_task(p)
unuse_process(p->mm, entry, page);
......@@ -377,8 +378,6 @@ static int try_to_unuse(unsigned int type)
shm_unuse(entry, page);
/* Now get rid of the extra reference to the temporary
page we've been using. */
if (PageSwapCache(page))
delete_from_swap_cache(page);
page_cache_release(page);
/*
* Check for and clear any overflowed swap map counts.
......
net/802/Makefile
View file @ 99234b21
......@@ -8,34 +8,38 @@
# Note 2! The CFLAGS definition is now in the main makefile...
O_TARGET := 802.o
O_OBJS = p8023.o
export-objs = llc_macinit.o p8022.o psnap.o
obj-y = p8023.o
obj-$(CONFIG_SYSCTL) += sysctl_net_802.o
obj-$(CONFIG_LLC) += llc_sendpdu.o llc_utility.o cl2llc.o llc_macinit.o
ifeq ($(CONFIG_SYSCTL),y)
O_OBJS += sysctl_net_802.o
obj-y += sysctl_net_802.o
endif
ifeq ($(CONFIG_LLC),y)
SUB_DIRS += transit
O_OBJS += llc_sendpdu.o llc_utility.o cl2llc.o
OX_OBJS += llc_macinit.o
subdir-y += transit
obj-y += llc_sendpdu.o llc_utility.o cl2llc.o llc_macinit.o
SNAP = y
endif
ifdef CONFIG_TR
O_OBJS += tr.o
obj-y += tr.o
SNAP=y
endif
ifdef CONFIG_NET_FC
O_OBJS += fc.o
obj-y += fc.o
endif
ifdef CONFIG_FDDI
O_OBJS += fddi.o
obj-y += fddi.o
endif
ifdef CONFIG_HIPPI
O_OBJS += hippi.o
obj-y += hippi.o
endif
ifdef CONFIG_IPX
......@@ -47,10 +51,9 @@ ifdef CONFIG_ATALK
endif
ifeq ($(SNAP),y)
OX_OBJS += p8022.o psnap.o
obj-y += p8022.o psnap.o
endif
include $(TOPDIR)/Rules.make
cl2llc.c: cl2llc.pre
......
net/Makefile
View file @ 99234b21
......@@ -56,15 +56,4 @@ endif
# Subdirectories that should be entered when MAKING_MODULES=1, even if set to 'y'.
both-m := $(filter $(mod-subdirs), $(subdir-y))
# 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)))
SUB_DIRS := $(subdir-y)
MOD_SUB_DIRS := $(sort $(subdir-m) $(both-m))
ALL_SUB_DIRS := $(sort $(subdir-y) $(subdir-m) $(subdir-n) $(subdir-))
include $(TOPDIR)/Rules.make
net/appletalk/Makefile
View file @ 99234b21
......@@ -8,14 +8,13 @@
# Note 2! The CFLAGS definition is now in the main makefile...
O_TARGET := appletalk.o
O_OBJS := aarp.o
M_OBJS := $(O_TARGET)
OX_OBJS += ddp.o
export-objs = ddp.o
ifeq ($(CONFIG_SYSCTL),y)
O_OBJS += sysctl_net_atalk.o
endif
obj-y := aarp.o ddp.o
obj-m := $(O_TARGET)
obj-$(CONFIG_SYSCTL) += sysctl_net_atalk.o
include $(TOPDIR)/Rules.make
......
net/atm/Makefile
View file @ 99234b21
This diff is collapsed.
net/ax25/Makefile
View file @ 99234b21
This diff is collapsed.
net/bridge/Makefile
View file @ 99234b21
This diff is collapsed.
net/core/Makefile
View file @ 99234b21
This diff is collapsed.
net/decnet/Makefile
View file @ 99234b21
This diff is collapsed.
net/econet/Makefile
View file @ 99234b21
This diff is collapsed.
net/ethernet/Makefile
View file @ 99234b21
This diff is collapsed.
net/ipv4/Makefile
View file @ 99234b21
This diff is collapsed.
net/ipv4/netfilter/Makefile
View file @ 99234b21
This diff is collapsed.
net/ipv6/Makefile
View file @ 99234b21
This diff is collapsed.
net/ipv6/netfilter/Makefile
View file @ 99234b21
This diff is collapsed.
net/ipx/Makefile
View file @ 99234b21
This diff is collapsed.
net/irda/Makefile
View file @ 99234b21
This diff is collapsed.
net/irda/compressors/Makefile
View file @ 99234b21
This diff is collapsed.
net/irda/ircomm/Makefile
View file @ 99234b21
This diff is collapsed.
net/irda/irlan/Makefile
View file @ 99234b21
This diff is collapsed.
net/irda/irnet/Makefile
View file @ 99234b21
This diff is collapsed.
net/khttpd/Makefile
View file @ 99234b21
This diff is collapsed.
net/lapb/Makefile
View file @ 99234b21
This diff is collapsed.
net/netlink/Makefile
View file @ 99234b21
This diff is collapsed.
net/netrom/Makefile
View file @ 99234b21
This diff is collapsed.
net/packet/Makefile
View file @ 99234b21
This diff is collapsed.
net/rose/Makefile
View file @ 99234b21
This diff is collapsed.
net/sched/Makefile
View file @ 99234b21
This diff is collapsed.
net/sunrpc/Makefile
View file @ 99234b21
This diff is collapsed.
net/unix/Makefile
View file @ 99234b21
This diff is collapsed.
net/wanrouter/Makefile
View file @ 99234b21
This diff is collapsed.
net/x25/Makefile
View file @ 99234b21
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7