Commit bd7c5358 authored by Kai Germaschewski's avatar Kai Germaschewski

Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make-drivers
parents 08a2a0a6 3a325171
......@@ -110,56 +110,8 @@ NETWORKS =net/network.o
LIBS =$(TOPDIR)/lib/lib.a
SUBDIRS =init kernel lib drivers mm fs net ipc sound
DRIVERS-n :=
DRIVERS-y :=
DRIVERS-m :=
DRIVERS- :=
DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
DRIVERS-$(CONFIG_ACPI) += drivers/acpi/acpi.o
DRIVERS-$(CONFIG_PARPORT) += drivers/parport/driver.o
DRIVERS-y += drivers/base/base.o \
drivers/char/char.o \
drivers/block/block.o \
drivers/misc/misc.o \
drivers/net/net.o \
drivers/media/media.o
DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/built-in.o
DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
DRIVERS-$(CONFIG_FC4) += drivers/fc4/built-in.o
DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
DRIVERS-$(CONFIG_FUSION) += drivers/message/message.o
DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o
ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR)$(CONFIG_PARIDE_PCD),)
DRIVERS-y += drivers/cdrom/driver.o
endif
DRIVERS-y = drivers/built-in.o
DRIVERS-$(CONFIG_SOUND) += sound/sound.o
DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o
DRIVERS-$(CONFIG_DIO) += drivers/dio/built-in.o
DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
DRIVERS-$(CONFIG_ALL_PPC) += drivers/macintosh/macintosh.o
DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp.o
DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/built-in.o
DRIVERS-$(CONFIG_VT) += drivers/video/video.o
DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/built-in.o
DRIVERS-$(CONFIG_TC) += drivers/tc/built-in.o
DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o
DRIVERS-$(CONFIG_SERIO) += drivers/input/serio/seriodrv.o
DRIVERS-$(CONFIG_I2O) += drivers/message/message.o
DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o
DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
DRIVERS-$(CONFIG_BLUEZ) += drivers/bluetooth/bluetooth.o
DRIVERS-$(CONFIG_HOTPLUG_PCI) += drivers/hotplug/vmlinux-obj.o
DRIVERS-$(CONFIG_ISDN) += drivers/isdn/vmlinux-obj.o
DRIVERS := $(DRIVERS-y)
......
......@@ -189,7 +189,7 @@ endif
ifeq ($(findstring y,$(CONFIG_ARCH_CLPS7500) $(CONFIG_ARCH_L7200)),y)
SUBDIRS +=drivers/acorn/char
DRIVERS +=drivers/acorn/char/acorn-char.o
DRIVERS +=drivers/acorn/char/built-in.o
endif
MAKEBOOT =$(MAKE) -C arch/$(ARCH)/boot
......
......@@ -32,7 +32,7 @@ HEAD := arch/s390/kernel/head.o arch/s390/kernel/init_task.o
SUBDIRS := $(SUBDIRS) arch/s390/mm arch/s390/kernel arch/s390/lib \
drivers/s390 arch/s390/math-emu
CORE_FILES := arch/s390/mm/mm.o arch/s390/kernel/kernel.o $(CORE_FILES)
DRIVERS := $(DRIVERS) drivers/s390/io.o
DRIVERS := $(DRIVERS) drivers/s390/built-in.o
LIBS := $(TOPDIR)/arch/s390/lib/lib.a $(LIBS) $(TOPDIR)/arch/s390/lib/lib.a
ifeq ($(CONFIG_MATHEMU),y)
......
# s390/Makefile
# s390x/Makefile
#
# This file is included by the global makefile so that you can add your own
# architecture-specific flags and dependencies. Remember to do have actions
......@@ -33,7 +33,7 @@ HEAD := arch/s390x/kernel/head.o arch/s390x/kernel/init_task.o
SUBDIRS := $(SUBDIRS) arch/s390x/mm arch/s390x/kernel arch/s390x/lib \
drivers/s390
CORE_FILES := arch/s390x/mm/mm.o arch/s390x/kernel/kernel.o $(CORE_FILES)
DRIVERS := $(DRIVERS) drivers/s390/io.o
DRIVERS := $(DRIVERS) drivers/s390/built-in.o
LIBS := $(TOPDIR)/arch/s390x/lib/lib.a $(LIBS) $(TOPDIR)/arch/s390x/lib/lib.a
all: image listing
......
......@@ -9,43 +9,43 @@
mod-subdirs := dio mtd sbus video macintosh usb input telephony sgi ide \
message scsi md ieee1394 pnp isdn atm \
fc4 i2c acpi bluetooth input/serio \
input/gameport parport hotplug
input/gameport parport hotplug \
base char block misc net media cdrom
subdir-y := base char block net misc media cdrom
subdir-m := $(subdir-y)
subdir-$(CONFIG_PARPORT) += parport
subdir-$(CONFIG_HOTPLUG_PCI) += hotplug
subdir-$(CONFIG_DIO) += dio
subdir-$(CONFIG_PCI) += pci
subdir-$(CONFIG_PCMCIA) += pcmcia
subdir-$(CONFIG_MTD) += mtd
subdir-$(CONFIG_SBUS) += sbus
subdir-$(CONFIG_ZORRO) += zorro
subdir-$(CONFIG_NUBUS) += nubus
subdir-$(CONFIG_TC) += tc
subdir-$(CONFIG_VT) += video
subdir-$(CONFIG_MAC) += macintosh
subdir-$(CONFIG_ALL_PPC) += macintosh
subdir-$(CONFIG_USB) += usb
subdir-$(CONFIG_INPUT) += input
subdir-$(CONFIG_SERIO) += input/serio
subdir-$(CONFIG_GAMEPORT) += input/gameport
subdir-$(CONFIG_PHONE) += telephony
subdir-$(CONFIG_SGI) += sgi
subdir-$(CONFIG_IDE) += ide
subdir-$(CONFIG_SCSI) += scsi
subdir-$(CONFIG_I2O) += message
subdir-$(CONFIG_FUSION) += message
subdir-$(CONFIG_MD) += md
subdir-$(CONFIG_IEEE1394) += ieee1394
subdir-$(CONFIG_PNP) += pnp
subdir-$(CONFIG_ISDN) += isdn
subdir-$(CONFIG_ATM) += atm
subdir-$(CONFIG_FC4) += fc4
subdir-$(CONFIG_I2C) += i2c
subdir-$(CONFIG_ACPI) += acpi
subdir-$(CONFIG_BLUEZ) += bluetooth
obj-$(CONFIG_PCI) += pci/
obj-$(CONFIG_ACPI) += acpi/
obj-$(CONFIG_PARPORT) += parport/
obj-y += base/ char/ block/ misc/ net/ media/
obj-$(CONFIG_NUBUS) += nubus/
obj-$(CONFIG_ATM) += atm/
obj-$(CONFIG_IDE) += ide/
obj-$(CONFIG_FC4) += fc4/
obj-$(CONFIG_SCSI) += scsi/
obj-$(CONFIG_FUSION) += message/
obj-$(CONFIG_IEEE1394) += ieee1394/
obj-y += cdrom/
obj-$(CONFIG_MTD) += mtd/
obj-$(CONFIG_PCMCIA) += pcmcia/
obj-$(CONFIG_DIO) += dio/
obj-$(CONFIG_SBUS) += sbus/
obj-$(CONFIG_ZORRO) += zorro/
obj-$(CONFIG_ALL_PPC) += macintosh/
obj-$(CONFIG_MAC) += macintosh/
obj-$(CONFIG_PNP) += pnp/
obj-$(CONFIG_SGI) += sgi/
obj-$(CONFIG_VT) += video/
obj-$(CONFIG_PARIDE) += block/paride/
obj-$(CONFIG_TC) += tc/
obj-$(CONFIG_USB) += usb/
obj-$(CONFIG_INPUT) += input/
obj-$(CONFIG_GAMEPORT) += input/gameport/
obj-$(CONFIG_SERIO) += input/serio/
obj-$(CONFIG_I2O) += message/
obj-$(CONFIG_I2C) += i2c/
obj-$(CONFIG_PHONE) += telephony/
obj-$(CONFIG_MD) += md/
obj-$(CONFIG_BLUEZ) += bluetooth/
obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
obj-$(CONFIG_ISDN) += isdn/
include $(TOPDIR)/Rules.make
#
# Makefile for the Acorn-specific Linux kernel device drivers.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (not a .c file).
subdir-y := char
subdir-m := $(subdir-y)
# the BLOCK subdir is included from drivers/block now
# the SCSI subdir is included from drivers/scsi now
# the NET subdir is included from drivers/net now
include $(TOPDIR)/Rules.make
......@@ -2,14 +2,6 @@
# Makefile for the Acorn block device drivers.
#
O_TARGET := acorn-block.o
obj-y :=
obj-m :=
obj-n :=
obj- :=
export-objs :=
fd1772_mod-objs := fd1772.o fd1772dma.o
mfmhd_mod-objs := mfmhd.o mfm.o
......
#
# Makefile for the kernel character device drivers.
# Makefile for the acorn character device drivers.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definitions are now inherited from the
# parent makes..
#
O_TARGET := acorn-char.o
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
# All the objects that export symbols.
export-objs := mouse_rpc.o
......
......@@ -2,8 +2,6 @@
# Makefile for the Linux ACPI interpreter
#
O_TARGET := acpi.o
export ACPI_CFLAGS
ACPI_CFLAGS := -D_LINUX -I$(CURDIR)/include
......
......@@ -2,8 +2,6 @@
# Makefile for the Linux network (ATM) device drivers.
#
O_TARGET := atm.o
export-objs := uPD98402.o suni.o idt77105.o
obj-y := atmdev_init.o
......
O_TARGET := base.o
# Makefile for the Linux device tree
obj-y := core.o sys.o interface.o fs.o power.o bus.o
......
......@@ -8,8 +8,6 @@
# In the future, some of these should be built conditionally.
#
O_TARGET := block.o
export-objs := elevator.o ll_rw_blk.o blkpg.o loop.o DAC960.o genhd.o block_ioctl.o
obj-y := elevator.o ll_rw_blk.o blkpg.o genhd.o block_ioctl.o
......@@ -33,6 +31,4 @@ obj-$(CONFIG_BLK_DEV_DAC960) += DAC960.o
obj-$(CONFIG_BLK_DEV_UMEM) += umem.o
obj-$(CONFIG_BLK_DEV_NBD) += nbd.o
subdir-$(CONFIG_PARIDE) += paride
include $(TOPDIR)/Rules.make
......@@ -2,21 +2,14 @@
# Makefile for Bluetooth HCI device drivers.
#
O_TARGET := bluetooth.o
list-multi := hci_uart.o
obj-$(CONFIG_BLUEZ_HCIUSB) += hci_usb.o
obj-$(CONFIG_BLUEZ_HCIVHCI) += hci_vhci.o
obj-$(CONFIG_BLUEZ_HCIUART) += hci_uart.o
uart-y := hci_ldisc.o
uart-$(CONFIG_BLUEZ_HCIUART_H4) += hci_h4.o
obj-$(CONFIG_BLUEZ_HCIDTL1) += dtl1_cs.o
obj-$(CONFIG_BLUEZ_HCIBLUECARD) += bluecard_cs.o
include $(TOPDIR)/Rules.make
hci_uart-y := hci_ldisc.o
hci_uart-$(CONFIG_BLUEZ_HCIUART_H4) += hci_h4.o
hci_uart-objs := $(hci_uart-y)
hci_uart.o: $(uart-y)
$(LD) -r -o $@ $(uart-y)
include $(TOPDIR)/Rules.make
......@@ -3,9 +3,6 @@
# 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.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
......
......@@ -7,8 +7,6 @@
#
FONTMAPFILE = cp437.uni
O_TARGET := char.o
obj-y += mem.o tty_io.o n_tty.o tty_ioctl.o raw.o pty.o misc.o random.o
# All of the (potential) objects that export symbols.
......
......@@ -2,8 +2,6 @@
# Makefile for the Linux kernel pci hotplug controller drivers.
#
O_TARGET := vmlinux-obj.o
export-objs := pci_hotplug_core.o pci_hotplug_util.o
obj-$(CONFIG_HOTPLUG_PCI) += pci_hotplug.o
......
......@@ -2,8 +2,6 @@
# Makefile for the kernel i2c bus driver.
#
O_TARGET := i2c.o
export-objs := i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \
i2c-algo-ite.o i2c-proc.o
......
......@@ -8,15 +8,9 @@
# In the future, some of these should be built conditionally.
#
O_TARGET := idedriver.o
export-objs := ide-taskfile.o main.o ide.o ide-features.o ide-probe.o quirks.o pcidma.o tcq.o \
atapi.o ataraid.o
obj-y :=
obj-m :=
ide-obj-y :=
obj-$(CONFIG_BLK_DEV_HD) += hd.o
obj-$(CONFIG_BLK_DEV_IDE) += ide-mod.o
obj-$(CONFIG_BLK_DEV_IDECS) += ide-cs.o
......
......@@ -2,8 +2,6 @@
# Makefile for the Linux IEEE 1394 implementation
#
O_TARGET := ieee1394drv.o
export-objs := ieee1394_core.o ohci1394.o cmp.o
ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \
......
......@@ -2,10 +2,6 @@
# Makefile for the input core drivers.
#
# The target object and module list name.
O_TARGET := inputdrv.o
# Objects that export symbols.
mod-subdirs := joystick
......
......@@ -2,10 +2,6 @@
# Makefile for the gameport drivers.
#
# The target object and module list name.
O_TARGET := gamedrv.o
# Objects that export symbols.
export-objs := gameport.o
......
......@@ -2,10 +2,6 @@
# Makefile for the input core drivers.
#
# The target object and module list name.
O_TARGET := seriodrv.o
# Objects that export symbols.
export-objs := serio.o
......
# Makefile for the kernel ISDN subsystem and device drivers.
# The target object and module list name.
O_TARGET := vmlinux-obj.o
# Object files in subdirectories
mod-subdirs := i4l hisax capi eicon
......
#
# Makefile for the Macintosh-specific device drivers.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definitions are now inherited from the
# parent makes..
#
# The target object and module list name.
O_TARGET := macintosh.o
# Objects that export symbols.
......
......@@ -2,8 +2,6 @@
# Makefile for the kernel software RAID and LVM drivers.
#
O_TARGET := mddev.o
export-objs := md.o xor.o
lvm-mod-objs := lvm.o lvm-snap.o lvm-fs.o
......
#
# Makefile for the kernel multimedia device drivers.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definitions are now inherited from the
# parent makes..
#
subdir-y := video radio
mod-subdirs := video radio
O_TARGET := media.o
obj-y := $(join $(subdir-y),$(subdir-y:%=/%.o))
obj-y := video/ radio/
include $(TOPDIR)/Rules.make
......@@ -2,15 +2,6 @@
# Makefile for the kernel character device drivers.
#
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
O_TARGET := radio.o
# All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
......
......@@ -2,15 +2,6 @@
# Makefile for the kernel character device drivers.
#
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
O_TARGET := video.o
# All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
......
......@@ -2,8 +2,6 @@
# Makefile for MPT based block devices
#
O_TARGET := message.o
mod-subdirs := i2o fusion
obj-$(CONFIG_I2O) += i2o/
......
#
# Makefile for misc devices that really don't fit anywhere else.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definitions are now inherited from the
# parent makes..
#
O_TARGET := misc.o
include $(TOPDIR)/Rules.make
fastdep:
......@@ -5,19 +5,11 @@
# $Id: Makefile,v 1.63 2001/06/13 09:43:07 dwmw2 Exp $
obj-y += chips/chipslink.o maps/mapslink.o \
devices/devlink.o nand/nandlink.o
obj-m :=
obj-n :=
obj- :=
O_TARGET := mtdlink.o
mod-subdirs := chips maps devices nand
export-objs := mtdcore.o mtdpart.o redboot.o bootldr.o afs.o
mod-subdirs :=
subdir-y := chips maps devices nand
subdir-m := $(subdir-y)
obj-y += chips/ maps/ devices/ nand/
# *** BIG UGLY NOTE ***
#
......
......@@ -3,8 +3,6 @@
#
# $Id: Makefile,v 1.7 2001/10/05 06:53:51 dwmw2 Exp $
O_TARGET := chipslink.o
export-objs := chipreg.o gen_probe.o
# *** BIG UGLY NOTE ***
......
......@@ -3,8 +3,6 @@
#
# $Id: Makefile,v 1.4 2001/06/26 21:10:05 spse Exp $
O_TARGET := devlink.o
# *** BIG UGLY NOTE ***
#
# The removal of get_module_symbol() and replacement with
......
......@@ -3,8 +3,6 @@
#
# $Id: Makefile,v 1.13 2001/08/16 15:16:58 rmk Exp $
O_TARGET := mapslink.o
# Chip mappings
obj-$(CONFIG_MTD_CDB89712) += cdb89712.o
obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
......
......@@ -3,8 +3,6 @@
#
# $Id: Makefile,v 1.5 2001/09/19 22:39:59 dwmw2 Exp $
O_TARGET := nandlink.o
export-objs := nand.o nand_ecc.o
nandobjs-y := nand.o
......
# File: drivers/net/Makefile
#
# Makefile for the Linux network (ethercard) device drivers.
#
obj-y :=
obj-m :=
obj-n :=
obj- :=
mod-subdirs := appletalk arcnet fc irda tokenring tulip pcmcia wireless \
wan ../acorn/net
O_TARGET := net.o
# All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
......
#
# Makefile for the kernel Parallel port device drivers.
#
# Note! Parport is the Borg. We have assimilated some other
# drivers in the `char', `net' and `scsi' directories,
# but left them there to allay suspicion.
#
# 7 October 2000, Bartlomiej Zolnierkiewicz <bkz@linux-ide.org>
# Rewritten to use lists instead of if-statements.
#
O_TARGET := driver.o
export-objs := init.o parport_pc.o
......
#
# Makefile for the PCI bus specific drivers.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definition is now inherited from the
# parent makefile.
#
O_TARGET := driver.o
export-objs := access.o hotplug.o pci-driver.o pci.o pool.o probe.o proc.o search.o
......
......@@ -2,8 +2,6 @@
# Makefile for the kernel pcmcia subsystem (c/o David Hinds)
#
O_TARGET := pcmcia.o
export-objs := ds.o cs.o yenta.o pci_socket.o
obj-$(CONFIG_PCMCIA) += pcmcia_core.o ds.o
......
......@@ -2,8 +2,6 @@
# Makefile for the kernel Plug-and-Play device drivers.
#
O_TARGET := pnp.o
export-objs := isapnp.o pnpbios_core.o
isa-pnp-proc-$(CONFIG_PROC_FS) = isapnp_proc.o
......
......@@ -2,14 +2,11 @@
# Makefile for the S/390 specific device drivers
#
O_TARGET := io.o
mod-subdirs := block char misc net
subdir-y := block char misc net
subdir-m := $(subdir-y)
obj-y := s390io.o s390mach.o s390dyn.o idals.o ccwcache.o
export-objs += ccwcache.o idals.o s390dyn.o s390io.o
obj-y += $(foreach dir,$(subdir-y),$(dir)/s390-$(dir).o)
obj-y += s390io.o s390mach.o s390dyn.o idals.o ccwcache.o
obj-y += block/ char/ misc/ net/
include $(TOPDIR)/Rules.make
......@@ -2,8 +2,6 @@
# S/390 block devices
#
O_TARGET := s390-block.o
export-objs := dasd.o
dasd_eckd_mod-objs := dasd_eckd.o dasd_3990_erp.o dasd_9343_erp.o
......
......@@ -2,8 +2,6 @@
# S/390 character devices
#
O_TARGET := s390-char.o
export-objs := hwc_rw.o
tub3270-objs := tuball.o tubfs.o tubtty.o \
......
......@@ -2,8 +2,6 @@
# S/390 miscellaneous devices
#
O_TARGET := s390-misc.o
obj-$(CONFIG_CHANDEV) += chandev.o
export-objs += chandev.o
......
......@@ -2,8 +2,6 @@
# S/390 network devices
#
O_TARGET := s390-net.o
export-objs := iucv.o fsm.o
ctc-objs := ctcmain.o ctctty.o
......
#
# Makefile for the linux kernel.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := sbus_all.o
ifneq ($(ARCH),m68k)
obj-y := sbus.o dvma.o
endif
subdir-y += char
subdir-m += char
obj-$(CONFIG_SBUSCHAR) += char/sunchar.o
subdir-y += audio
subdir-m += audio
mod-subdirs := char audio
# This is grotty but works around some problems with modules.
ifeq ($(CONFIG_SPARCAUDIO),y)
obj-y += audio/sparcaudio.o
endif
obj-$(CONFIG_SBUSCHAR) += char/
obj-$(CONFIG_SPARCAUDIO) += audio/
include $(TOPDIR)/Rules.make
......@@ -5,8 +5,6 @@
# Rewritten to use lists instead of if-statements.
#
O_TARGET := sparcaudio.o
export-objs := audio.o amd7930.o dbri.o
obj-$(CONFIG_SPARCAUDIO) += audio.o
......
......@@ -7,8 +7,6 @@
# Rewritten to use lists instead of if-statements.
#
O_TARGET := sunchar.o
export-objs := su.o bbc_i2c.o
obj-y := sunkbd.o sunkbdmap.o sunmouse.o sunserial.o zs.o
......
......@@ -18,9 +18,6 @@ CFLAGS_aha152x.o = -DAHA152X_STAT -DAUTOCONF
CFLAGS_gdth.o = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS
CFLAGS_seagate.o = -DARBITRATE -DPARITY -DSEAGATE_USE_ASM
O_TARGET := scsidrv.o
export-objs := scsi_syms.o 53c700.o
mod-subdirs := pcmcia ../acorn/scsi
......
......@@ -5,8 +5,8 @@
#
# Character and Audio devices for SGI machines.
#
subdir-y += char
subdir-m += char
obj-y += char/sgichar.o
obj-y += char/
include $(TOPDIR)/Rules.make
#
# Makefile for the linux kernel.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := sgichar.o
export-objs := newport.o shmiq.o sgicons.o usema.o
obj-y := newport.o shmiq.o sgicons.o usema.o streamable.o
......
#
# Makefile for drivers/telephony
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
obj-y :=
obj-n :=
obj-m :=
obj- :=
export-objs := phonedev.o ixj.o
obj-$(CONFIG_PHONE) += phonedev.o
obj-$(CONFIG_PHONE_IXJ) += ixj.o
obj-$(CONFIG_PHONE_IXJ_PCMCIA) += ixj_pcmcia.o
O_TARGET := telephony.o
include $(TOPDIR)/Rules.make
......@@ -2,65 +2,61 @@
# Makefile for the kernel USB device drivers.
#
O_TARGET := usbdrv.o
# Object files in subdirectories
mod-subdirs := serial
subdir-$(CONFIG_USB) += core
subdir-$(CONFIG_USB_EHCI_HCD) += host
subdir-$(CONFIG_USB_OHCI_HCD) += host
subdir-$(CONFIG_USB_OHCI) += host
subdir-$(CONFIG_USB_UHCI_ALT) += host
subdir-$(CONFIG_USB_UHCI_HCD_ALT) += host
subdir-$(CONFIG_USB_UHCI_HCD) += host
subdir-$(CONFIG_USB_UHCI) += host
subdir-$(CONFIG_USB_ACM) += class
subdir-$(CONFIG_USB_AUDIO) += class
subdir-$(CONFIG_USB_BLUETOOTH_TTY) += class
subdir-$(CONFIG_USB_PRINTER) += class
subdir-$(CONFIG_USB_STORAGE) += storage
subdir-$(CONFIG_USB_HID) += input
subdir-$(CONFIG_USB_KBD) += input
subdir-$(CONFIG_USB_MOUSE) += input
subdir-$(CONFIG_USB_WACOM) += input
subdir-$(CONFIG_USB_DABUSB) += media
subdir-$(CONFIG_USB_DSBR) += media
subdir-$(CONFIG_USB_IBMCAM) += media
subdir-$(CONFIG_USB_KONICAWC) += media
subdir-$(CONFIG_USB_OV511) += media
subdir-$(CONFIG_USB_PWC) += media
subdir-$(CONFIG_USB_SE401) += media
subdir-$(CONFIG_USB_STV680) += media
subdir-$(CONFIG_USB_VICAM) += media
subdir-$(CONFIG_USB_CATC) += net
subdir-$(CONFIG_USB_CDCETHER) += net
subdir-$(CONFIG_USB_KAWETH) += net
subdir-$(CONFIG_USB_PEGASUS) += net
subdir-$(CONFIG_USB_RTL8150) += net
subdir-$(CONFIG_USB_USBNET) += net
subdir-$(CONFIG_USB_DC2XX) += image
subdir-$(CONFIG_USB_HPUSBSCSI) += image
subdir-$(CONFIG_USB_MDC800) += image
subdir-$(CONFIG_USB_MICROTEK) += image
subdir-$(CONFIG_USB_SCANNER) += image
subdir-$(CONFIG_USB_SERIAL) += serial
subdir-$(CONFIG_USB_AUERSWALD) += misc
subdir-$(CONFIG_USB_BRLVGER) += misc
subdir-$(CONFIG_USB_EMI26) += misc
subdir-$(CONFIG_USB_RIO500) += misc
subdir-$(CONFIG_USB_TIGL) += misc
subdir-$(CONFIG_USB_USS720) += misc
obj-y += $(join $(subdir-y),$(subdir-y:%=/%.o))
obj-$(CONFIG_USB) += core/
obj-$(CONFIG_USB_EHCI_HCD) += host/
obj-$(CONFIG_USB_OHCI_HCD) += host/
obj-$(CONFIG_USB_OHCI) += host/
obj-$(CONFIG_USB_UHCI_ALT) += host/
obj-$(CONFIG_USB_UHCI_HCD_ALT) += host/
obj-$(CONFIG_USB_UHCI_HCD) += host/
obj-$(CONFIG_USB_UHCI) += host/
obj-$(CONFIG_USB_ACM) += class/
obj-$(CONFIG_USB_AUDIO) += class/
obj-$(CONFIG_USB_BLUETOOTH_TTY) += class/
obj-$(CONFIG_USB_PRINTER) += class/
obj-$(CONFIG_USB_STORAGE) += storage/
obj-$(CONFIG_USB_HID) += input/
obj-$(CONFIG_USB_KBD) += input/
obj-$(CONFIG_USB_MOUSE) += input/
obj-$(CONFIG_USB_WACOM) += input/
obj-$(CONFIG_USB_DABUSB) += media/
obj-$(CONFIG_USB_DSBR) += media/
obj-$(CONFIG_USB_IBMCAM) += media/
obj-$(CONFIG_USB_KONICAWC) += media/
obj-$(CONFIG_USB_OV511) += media/
obj-$(CONFIG_USB_PWC) += media/
obj-$(CONFIG_USB_SE401) += media/
obj-$(CONFIG_USB_STV680) += media/
obj-$(CONFIG_USB_VICAM) += media/
obj-$(CONFIG_USB_CATC) += net/
obj-$(CONFIG_USB_CDCETHER) += net/
obj-$(CONFIG_USB_KAWETH) += net/
obj-$(CONFIG_USB_PEGASUS) += net/
obj-$(CONFIG_USB_RTL8150) += net/
obj-$(CONFIG_USB_USBNET) += net/
obj-$(CONFIG_USB_DC2XX) += image/
obj-$(CONFIG_USB_HPUSBSCSI) += image/
obj-$(CONFIG_USB_MDC800) += image/
obj-$(CONFIG_USB_MICROTEK) += image/
obj-$(CONFIG_USB_SCANNER) += image/
obj-$(CONFIG_USB_SERIAL) += serial/
obj-$(CONFIG_USB_AUERSWALD) += misc/
obj-$(CONFIG_USB_BRLVGER) += misc/
obj-$(CONFIG_USB_EMI26) += misc/
obj-$(CONFIG_USB_RIO500) += misc/
obj-$(CONFIG_USB_TIGL) += misc/
obj-$(CONFIG_USB_USS720) += misc/
include $(TOPDIR)/Rules.make
......@@ -3,8 +3,6 @@
# (one step up from the misc category)
#
O_TARGET := class.o
obj-$(CONFIG_USB_ACM) += cdc-acm.o
obj-$(CONFIG_USB_AUDIO) += audio.o
obj-$(CONFIG_USB_BLUETOOTH_TTY) += bluetty.o
......
......@@ -2,8 +2,6 @@
# Makefile for USB Core files and filesystem
#
O_TARGET := core.o
export-objs := usb.o hcd.o
usbcore-objs := usb.o usb-debug.o hub.o hcd.o
......
......@@ -3,8 +3,6 @@
# framework and drivers
#
O_TARGET := host.o
obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o
obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o
obj-$(CONFIG_USB_UHCI_HCD) += usb-uhci-hcd.o
......
......@@ -2,8 +2,6 @@
# Makefile for USB Image drivers
#
O_TARGET := image.o
obj-$(CONFIG_USB_MDC800) += mdc800.o
obj-$(CONFIG_USB_HPUSBSCSI) += hpusbscsi.o
obj-$(CONFIG_USB_MICROTEK) += microtek.o
......
......@@ -2,8 +2,6 @@
# Makefile for the USB input drivers
#
O_TARGET := input.o
# Multipart objects.
hid-objs := hid-core.o
......
......@@ -2,8 +2,6 @@
# Makefile for USB Media drivers
#
O_TARGET := media.o
export-objs := ov511.o pwc-uncompress.o usbvideo.o
pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o
......
......@@ -3,8 +3,6 @@
# (the ones that don't fit into any other categories)
#
O_TARGET := misc.o
obj-$(CONFIG_USB_AUERSWALD) += auerswald.o
obj-$(CONFIG_USB_BRLVGER) += brlvger.o
obj-$(CONFIG_USB_EMI26) += emi26.o
......
......@@ -2,8 +2,6 @@
# Makefile for USB Network drivers
#
O_TARGET := net.o
obj-$(CONFIG_USB_CATC) += catc.o
obj-$(CONFIG_USB_CDCETHER) += cdc-ether.o
obj-$(CONFIG_USB_KAWETH) += kaweth.o
......
......@@ -2,8 +2,6 @@
# Makefile for the USB serial device drivers.
#
O_TARGET := serial.o
# Object file lists.
obj-$(CONFIG_USB_SERIAL) += usbserial.o
......
......@@ -5,7 +5,6 @@
# Rewritten to use lists instead of if-statements.
#
O_TARGET := storage.o
EXTRA_CFLAGS := -I../../scsi/
obj-$(CONFIG_USB_STORAGE) += usb-storage.o
......
......@@ -2,8 +2,6 @@
# 5 Aug 1999, James Simmons, <mailto:jsimmons@users.sf.net>
# Rewritten to use lists instead of if-statements.
O_TARGET := video.o
mod-subdirs := matrox
# All of the (potential) objects that export symbols.
......
#
# Makefile for the Zorro bus specific drivers.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definition is now inherited from the
# parent makefile.
#
O_TARGET := driver.o
export-objs := zorro.o
......
......@@ -391,19 +391,9 @@ int kernel_read(struct file *file, unsigned long offset,
return result;
}
static int exec_mmap(void)
static int exec_mmap(struct mm_struct *mm)
{
struct mm_struct * mm, * old_mm;
old_mm = current->mm;
mm = mm_alloc();
if (mm) {
struct mm_struct *active_mm;
if (init_new_context(current, mm)) {
mmdrop(mm);
return -ENOMEM;
}
struct mm_struct * old_mm, *active_mm;
/* Add it to the list of mm's */
spin_lock(&mmlist_lock);
......@@ -412,6 +402,7 @@ static int exec_mmap(void)
spin_unlock(&mmlist_lock);
task_lock(current);
old_mm = current->mm;
active_mm = current->active_mm;
current->mm = mm;
current->active_mm = mm;
......@@ -425,8 +416,6 @@ static int exec_mmap(void)
}
mmdrop(active_mm);
return 0;
}
return -ENOMEM;
}
/*
......@@ -565,7 +554,7 @@ int flush_old_exec(struct linux_binprm * bprm)
/*
* Release all of the old mmap stuff
*/
retval = exec_mmap();
retval = exec_mmap(bprm->mm);
if (retval) goto mmap_failed;
/* This is the point of no return */
......@@ -896,17 +885,23 @@ int do_execve(char * filename, char ** argv, char ** envp, struct pt_regs * regs
bprm.sh_bang = 0;
bprm.loader = 0;
bprm.exec = 0;
if ((bprm.argc = count(argv, bprm.p / sizeof(void *))) < 0) {
allow_write_access(file);
fput(file);
return bprm.argc;
}
if ((bprm.envc = count(envp, bprm.p / sizeof(void *))) < 0) {
allow_write_access(file);
fput(file);
return bprm.envc;
}
bprm.mm = mm_alloc();
retval = -ENOMEM;
if (!bprm.mm)
goto out_file;
retval = init_new_context(current, bprm.mm);
if (retval < 0)
goto out_mm;
bprm.argc = count(argv, bprm.p / sizeof(void *));
if ((retval = bprm.argc) < 0)
goto out_mm;
bprm.envc = count(envp, bprm.p / sizeof(void *));
if ((retval = bprm.envc) < 0)
goto out_mm;
retval = prepare_binprm(&bprm);
if (retval < 0)
......@@ -932,16 +927,20 @@ int do_execve(char * filename, char ** argv, char ** envp, struct pt_regs * regs
out:
/* Something went wrong, return the inode and free the argument pages*/
allow_write_access(bprm.file);
if (bprm.file)
fput(bprm.file);
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
struct page * page = bprm.page[i];
if (page)
__free_page(page);
}
out_mm:
mmdrop(bprm.mm);
out_file:
if (bprm.file) {
allow_write_access(bprm.file);
fput(bprm.file);
}
return retval;
}
......
......@@ -22,6 +22,7 @@
struct linux_binprm{
char buf[BINPRM_BUF_SIZE];
struct page *page[MAX_ARG_PAGES];
struct mm_struct *mm;
unsigned long p; /* current top of mem */
int sh_bang;
struct file * file;
......
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