Menu
▾
▴
[linuxsh-dev] 2.5.15
|
From: NIIBE Y. <gn...@m1...> - 2002-05-23 01:11:36
|
Changes from mainline. I don't make arch/sh/kernel/pci directory yet.
2002-05-23 NIIBE Yutaka <gn...@m1...>
* arch/sh/kernel/signal.c (do_signal): Added SIGURG case.
* AGAINST-2.5.15: New file.
* AGAINST-2.5.14: Removed.
* Makefile: Version 2.5.15.
* arch/sh/kernel/pci_st40.c, arch/sh/kernel/pcibios.c,
drivers/Makefile, drivers/char/Makefile, include/asm-sh/ide.h,
kernel/ptrace.c: Incorporate changes in 2.5.15.
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/Makefile,v
retrieving revision 1.21
diff -u -3 -p -r1.21 Makefile
--- Makefile 6 May 2002 00:50:01 -0000 1.21
+++ Makefile 23 May 2002 01:06:52 -0000
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 13
+SUBLEVEL = 15
EXTRAVERSION =-sh
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -130,6 +130,7 @@ DRIVERS-m :=
DRIVERS- :=
DRIVERS-$(CONFIG_ACPI) += drivers/acpi/acpi.o
+DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
DRIVERS-$(CONFIG_PARPORT) += drivers/parport/driver.o
DRIVERS-y += drivers/base/base.o \
drivers/char/char.o \
@@ -137,19 +138,12 @@ DRIVERS-y += drivers/base/base.o \
drivers/misc/misc.o \
drivers/net/net.o \
drivers/media/media.o
-DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
-DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o
DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
-DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
-DRIVERS-$(CONFIG_DEV_APPLETALK) += drivers/net/appletalk/appletalk.o
-DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.o
-DRIVERS-$(CONFIG_WAN) += drivers/net/wan/wan.o
-DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnetdrv.o
DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
-DRIVERS-$(CONFIG_FUSION_BOOT) += drivers/message/fusion/fusion.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),)
@@ -157,13 +151,8 @@ DRIVERS-y += drivers/cdrom/driver.o
endif
DRIVERS-$(CONFIG_SOUND) += sound/sound.o
-DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o
-DRIVERS-$(CONFIG_NET_PCMCIA) += drivers/net/pcmcia/pcmcia_net.o
-DRIVERS-$(CONFIG_NET_WIRELESS) += drivers/net/wireless/wireless_net.o
-DRIVERS-$(CONFIG_NET_TULIP) += drivers/net/tulip/tulip_net.o
-DRIVERS-$(CONFIG_PCMCIA_CHRDEV) += drivers/char/pcmcia/pcmcia_char.o
DRIVERS-$(CONFIG_DIO) += drivers/dio/dio.a
DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
@@ -173,14 +162,12 @@ DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp
DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a
DRIVERS-$(CONFIG_VT) += drivers/video/video.o
DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/paride.a
-DRIVERS-$(CONFIG_HAMRADIO) += drivers/net/hamradio/hamradio.o
DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a
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/i2o/i2o.o
-DRIVERS-$(CONFIG_IRDA) += drivers/net/irda/irda.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
@@ -392,17 +379,8 @@ else
depmod_opts := -b $(INSTALL_MOD_PATH) -r
endif
.PHONY: _modinst_post
-_modinst_post: _modinst_post_pcmcia
+_modinst_post:
if [ -r System.map ]; then $(DEPMOD) -ae -F System.map $(depmod_opts) $(KERNELRELEASE); fi
-
-# Backwards compatibilty symlinks for people still using old versions
-# of pcmcia-cs with hard coded pathnames on insmod. Remove
-# _modinst_post_pcmcia for kernel 2.4.1.
-.PHONY: _modinst_post_pcmcia
-_modinst_post_pcmcia:
- cd $(MODLIB); \
- mkdir -p pcmcia; \
- find kernel -path '*/pcmcia/*' -name '*.o' | xargs -i -r ln -sf ../{} pcmcia
.PHONY: $(patsubst %, _modinst_%, $(SUBDIRS))
$(patsubst %, _modinst_%, $(SUBDIRS)) :
Index: arch/sh/kernel/pci_st40.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/pci_st40.c,v
retrieving revision 1.1
diff -u -3 -p -r1.1 pci_st40.c
--- arch/sh/kernel/pci_st40.c 15 Oct 2001 20:44:51 -0000 1.1
+++ arch/sh/kernel/pci_st40.c 23 May 2002 01:06:52 -0000
@@ -414,10 +414,6 @@ void __init
pcibios_fixup_pbus_ranges(struct pci_bus *bus,
struct pbus_set_ranges_data *ranges)
{
- ranges->io_start -= bus->resource[0]->start;
- ranges->io_end -= bus->resource[0]->start;
- ranges->mem_start -= bus->resource[1]->start;
- ranges->mem_end -= bus->resource[1]->start;
}
void __init pcibios_init(void)
Index: arch/sh/kernel/pcibios.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/pcibios.c,v
retrieving revision 1.1
diff -u -3 -p -r1.1 pcibios.c
--- arch/sh/kernel/pcibios.c 15 Oct 2001 20:44:53 -0000 1.1
+++ arch/sh/kernel/pcibios.c 23 May 2002 01:06:52 -0000
@@ -61,6 +61,8 @@ pcibios_update_resource(struct pci_dev *
* modulo 0x400.
*/
void pcibios_align_resource(void *data, struct resource *res, unsigned long size)
+void pcibios_align_resource(void *data, struct resource *res,
+ unsigned long size, unsigned long align)
{
if (res->flags & IORESOURCE_IO) {
unsigned long start = res->start;
Index: arch/sh/kernel/signal.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/signal.c,v
retrieving revision 1.9
diff -u -3 -p -r1.9 signal.c
--- arch/sh/kernel/signal.c 12 Apr 2002 04:26:28 -0000 1.9
+++ arch/sh/kernel/signal.c 23 May 2002 01:06:52 -0000
@@ -643,7 +643,7 @@ int do_signal(struct pt_regs *regs, sigs
continue;
switch (signr) {
- case SIGCONT: case SIGCHLD: case SIGWINCH:
+ case SIGCONT: case SIGCHLD: case SIGWINCH: case SIGURG:
continue;
case SIGTSTP: case SIGTTIN: case SIGTTOU:
Index: drivers/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/Makefile,v
retrieving revision 1.7
diff -u -3 -p -r1.7 Makefile
--- drivers/Makefile 22 Mar 2002 10:52:09 -0000 1.7
+++ drivers/Makefile 23 May 2002 01:06:52 -0000
@@ -7,8 +7,8 @@
mod-subdirs := dio mtd sbus video macintosh usb input telephony sgi ide \
- message/i2o message/fusion scsi md ieee1394 pnp isdn atm \
- fc4 net/hamradio i2c acpi bluetooth input/serio \
+ message scsi md ieee1394 pnp isdn atm \
+ fc4 i2c acpi bluetooth input/serio \
input/gameport parport hotplug maple
subdir-y := base char block net misc media cdrom
@@ -35,17 +35,14 @@ subdir-$(CONFIG_PHONE) += telephony
subdir-$(CONFIG_SGI) += sgi
subdir-$(CONFIG_IDE) += ide
subdir-$(CONFIG_SCSI) += scsi
-subdir-$(CONFIG_I2O) += message/i2o
-subdir-$(CONFIG_FUSION) += message/fusion
+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
-
-# CONFIG_HAMRADIO can be set without CONFIG_NETDEVICE being set -- ch
-subdir-$(CONFIG_HAMRADIO) += net/hamradio
subdir-$(CONFIG_I2C) += i2c
subdir-$(CONFIG_ACPI) += acpi
Index: drivers/char/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/char/Makefile,v
retrieving revision 1.7
diff -u -3 -p -r1.7 Makefile
--- drivers/char/Makefile 1 May 2002 06:18:01 -0000 1.7
+++ drivers/char/Makefile 23 May 2002 01:06:52 -0000
@@ -150,7 +150,13 @@ obj-$(CONFIG_SPECIALIX) += specialix.o
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
obj-$(CONFIG_SX) += sx.o generic_serial.o
-obj-$(CONFIG_RIO) += rio/rio.o generic_serial.o
+
+obj-$(CONFIG_RIO) += generic_serial.o
+subdir-$(CONFIG_RIO) += rio
+ifeq ($(CONFIG_RIO),y)
+ obj-y += rio/rio.o
+endif
+
obj-$(CONFIG_SH_SCI) += sh-sci.o generic_serial.o
obj-$(CONFIG_SERIAL167) += serial167.o
obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
@@ -158,8 +164,6 @@ obj-$(CONFIG_MVME162_SCC) += generic_ser
obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o
-subdir-$(CONFIG_RIO) += rio
-
obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o
obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o
obj-$(CONFIG_PRINTER) += lp.o
@@ -191,12 +195,8 @@ 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
+ obj-y += ftape/ftape.o
endif
obj-$(CONFIG_H8) += h8.o
@@ -229,6 +229,21 @@ obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
subdir-$(CONFIG_MWAVE) += mwave
ifeq ($(CONFIG_MWAVE),y)
obj-y += mwave/mwave.o
+endif
+
+subdir-$(CONFIG_AGP) += agp
+ifeq ($(CONFIG_AGP),y)
+ obj-y += agp/agp.o
+endif
+
+subdir-$(CONFIG_DRM) += drm
+ifeq ($(CONFIG_DRM),y)
+ obj-y += drm/drm.o
+endif
+
+subdir-$(CONFIG_PCMCIA) += pcmcia
+ifeq ($(CONFIG_PCMCIA),y)
+ obj-y += pcmcia/pcmcia_char.o
endif
include $(TOPDIR)/Rules.make
Index: include/asm-sh/ide.h
===================================================================
RCS file: /cvsroot/linuxsh/linux/include/asm-sh/ide.h,v
retrieving revision 1.3
diff -u -3 -p -r1.3 ide.h
--- include/asm-sh/ide.h 1 May 2002 01:10:47 -0000 1.3
+++ include/asm-sh/ide.h 23 May 2002 01:06:52 -0000
@@ -95,7 +95,7 @@ static __inline__ void ide_init_hwif_por
static __inline__ void ide_init_default_hwifs(void)
{
-#ifndef CONFIG_BLK_DEV_IDEPCI
+#ifndef CONFIG_PCI
hw_regs_t hw;
int index;
@@ -104,37 +104,10 @@ static __inline__ void ide_init_default_
hw.irq = ide_default_irq(ide_default_io_base(index));
ide_register_hw(&hw, NULL);
}
-#endif /* CONFIG_BLK_DEV_IDEPCI */
+#endif /* CONFIG_PCI */
}
-typedef union {
- unsigned all : 8; /* all of the bits together */
- struct {
- unsigned head : 4; /* always zeros here */
- unsigned unit : 1; /* drive select number, 0 or 1 */
- unsigned bit5 : 1; /* always 1 */
- unsigned lba : 1; /* using LBA instead of CHS */
- unsigned bit7 : 1; /* always 1 */
- } b;
-} select_t;
-
-typedef union {
- unsigned all : 8; /* all of the bits together */
- struct {
- unsigned bit0 : 1;
- unsigned nIEN : 1; /* device INTRQ to host */
- unsigned SRST : 1; /* host soft reset bit */
- unsigned bit3 : 1; /* ATA-2 thingy */
- unsigned reserved456 : 3;
- unsigned HOB : 1; /* 48-bit address ordering */
- } b;
-} control_t;
-
-/*
- * The following are not needed for the non-m68k ports
- */
#define ide_ack_intr(hwif) (1)
-#define ide_fix_driveid(id) do {} while (0)
#define ide_release_lock(lock) do {} while (0)
#define ide_get_lock(lock, hdlr, data) do {} while (0)
Index: kernel/ptrace.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/kernel/ptrace.c,v
retrieving revision 1.7
diff -u -3 -p -r1.7 ptrace.c
--- kernel/ptrace.c 22 Mar 2002 10:52:09 -0000 1.7
+++ kernel/ptrace.c 23 May 2002 01:06:53 -0000
@@ -160,6 +160,7 @@ int access_process_vm(struct task_struct
put_page(page);
len -= bytes;
buf += bytes;
+ addr += bytes;
}
up_read(&mm->mmap_sem);
mmput(mm);
|
