Commit d383ba51 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge with Rusty 'trivial' Russell

parents 0e948558 bccdb12c
......@@ -1493,7 +1493,7 @@ M: perex@suse.cz
L: alsa-devel@alsa-project.org
S: Maintained
SPARC:
UltraSPARC (sparc64):
P: David S. Miller
M: davem@redhat.com
P: Eddie C. Dost
......@@ -1506,6 +1506,9 @@ L: sparclinux@vger.kernel.org
L: ultralinux@vger.kernel.org
S: Maintained
SPARC (sparc32):
S: Unmaintained
SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
P: Roger Wolff
M: R.E.Wolff@BitWizard.nl
......
......@@ -1140,7 +1140,7 @@ asmlinkage void smp_error_interrupt(void)
6: Received illegal vector
7: Illegal register address
*/
printk (KERN_ERR "APIC error on CPU%d: %02lx(%02lx)\n",
printk (KERN_INFO "APIC error on CPU%d: %02lx(%02lx)\n",
smp_processor_id(), v , v1);
irq_exit();
}
......
......@@ -132,6 +132,7 @@ EXPORT_SYMBOL_NOVERS(__write_lock_failed);
EXPORT_SYMBOL_NOVERS(__read_lock_failed);
/* Global SMP stuff */
EXPORT_SYMBOL(synchronize_irq);
EXPORT_SYMBOL(smp_call_function);
/* TLB flushing */
......
......@@ -791,7 +791,7 @@ void __init setup_ExtINT_IRQ0_pin(unsigned int pin, int vector)
entry.vector = vector;
/*
* The timer IRQ doesnt have to know that behind the
* The timer IRQ doesn't have to know that behind the
* scene we have a 8259A-master in AEOI mode ...
*/
irq_desc[0].handler = &ioapic_edge_irq_type;
......@@ -1654,7 +1654,7 @@ static inline void check_timer(void)
printk(" failed.\n");
if (nmi_watchdog) {
printk(KERN_WARNING "timer doesnt work through the IO-APIC - disabling NMI Watchdog!\n");
printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n");
nmi_watchdog = 0;
}
......
......@@ -71,15 +71,15 @@ fi
if [ "$CONFIG_IA64_SGI_SN1" = "y" -o "$CONFIG_IA64_SGI_SN2" = "y" ]; then
define_bool CONFIG_IA64_SGI_SN y
bool ' Enable extra debugging code' CONFIG_IA64_SGI_SN_DEBUG n
bool ' Enable extra debugging code' CONFIG_IA64_SGI_SN_DEBUG
bool ' Enable SGI Medusa Simulator Support' CONFIG_IA64_SGI_SN_SIM
bool ' Enable autotest (llsc). Option to run cache test instead of booting' \
CONFIG_IA64_SGI_AUTOTEST n
CONFIG_IA64_SGI_AUTOTEST
define_bool CONFIG_DEVFS_FS y
if [ "$CONFIG_DEVFS_FS" = "y" ]; then
bool ' Enable DEVFS Debug Code' CONFIG_DEVFS_DEBUG n
bool ' Enable DEVFS Debug Code' CONFIG_DEVFS_DEBUG
fi
bool ' Enable protocol mode for the L1 console' CONFIG_SERIAL_SGI_L1_PROTOCOL y
bool ' Enable protocol mode for the L1 console' CONFIG_SERIAL_SGI_L1_PROTOCOL
define_bool CONFIG_DISCONTIGMEM y
define_bool CONFIG_IA64_MCA y
define_bool CONFIG_NUMA y
......
......@@ -26,7 +26,7 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
choice 'Type of PHY' \
"LXT970 CONFIG_FCC_LXT970 \
LXT971 CONFIG_FCC_LXT971 \
QS6612 CONFIG_FCC_QS6612" CONFIG_FCC_LXT971
QS6612 CONFIG_FCC_QS6612" LXT971
fi
fi
fi
......
......@@ -38,7 +38,7 @@ typedef struct drm_mga_primary_buffer {
u32 tail;
int space;
volatile int wrapped;
volatile long wrapped;
volatile u32 *status;
......
......@@ -67,7 +67,7 @@ const ftape_info *zft_status;
/* Local vars.
*/
static int busy_flag;
static unsigned long busy_flag;
static sigset_t orig_sigmask;
......
......@@ -1881,15 +1881,23 @@ static int __init init_ISA(int i, int *reserved_controller)
{
int num_aiops, num_chan;
int aiop, chan;
int extent = 0;
unsigned int aiopio[MAX_AIOPS_PER_BOARD];
CONTROLLER_t *ctlp;
if (rcktpt_io_addr[i] == 0)
return(0);
if (check_region(rcktpt_io_addr[i],64)) {
if (rcktpt_io_addr[i] + 0x40 == controller) {
*reserved_controller = 1;
extent = 68;
} else {
extent = 64;
}
if (!request_region(rcktpt_io_addr[i], extent,
"Comtrol Rocketport")) {
printk("RocketPort board address 0x%lx in use...\n",
rcktpt_io_addr[i]);
rcktpt_io_addr[i]);
rcktpt_io_addr[i] = 0;
return(0);
}
......@@ -1901,6 +1909,7 @@ static int __init init_ISA(int i, int *reserved_controller)
aiopio, MAX_AIOPS_PER_BOARD, 0,
FREQ_DIS, 0);
if (num_aiops <= 0) {
release_region(rcktpt_io_addr[i], extent);
rcktpt_io_addr[i] = 0;
return(0);
}
......@@ -1914,14 +1923,6 @@ static int __init init_ISA(int i, int *reserved_controller)
printk("Rocketport controller #%d found at 0x%lx, "
"%d AIOPs\n", i, rcktpt_io_addr[i],
num_aiops);
if (rcktpt_io_addr[i] + 0x40 == controller) {
*reserved_controller = 1;
request_region(rcktpt_io_addr[i], 68,
"Comtrol Rocketport");
} else {
request_region(rcktpt_io_addr[i], 64,
"Comtrol Rocketport");
}
return(1);
}
......
......@@ -43,9 +43,9 @@ if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then
bool ' HFC-S+, HFC-SP, HFC-PCMCIA cards' CONFIG_HISAX_HFC_SX
if [ "$CONFIG_EXPERIMENTAL" != "n" ]; then
# bool ' TESTEMULATOR (EXPERIMENTAL)' CONFIG_HISAX_TESTEMU
bool ' Formula-n enter:now PCI card' CONFIG_HISAX_ENTERNOW_PCI
bool ' Formula-n enter:now PCI card (EXPERIMENTAL)' CONFIG_HISAX_ENTERNOW_PCI
if [ "$CONFIG_SPARC32" = "y" -o "$CONFIG_SPARC64" = "y" ]; then
bool ' Am7930' CONFIG_HISAX_AMD7930
bool ' Am7930 (EXPERIMENTAL)' CONFIG_HISAX_AMD7930
fi
fi
bool ' HiSax debugging' CONFIG_HISAX_DEBUG
......
......@@ -424,16 +424,19 @@ ergo_releasehardware(hysdn_card * card)
int
ergo_inithardware(hysdn_card * card)
{
if (check_region(card->iobase + PCI9050_INTR_REG, 1) ||
check_region(card->iobase + PCI9050_USER_IO, 1))
if (!request_region(card->iobase + PCI9050_INTR_REG, 1, "HYSDN"))
return (-1);
if (!request_region(card->iobase + PCI9050_USER_IO, 1, "HYSDN")) {
release_region(card->iobase + PCI9050_INTR_REG, 1);
return (-1); /* ports already in use */
}
card->memend = card->membase + ERG_DPRAM_PAGE_SIZE - 1;
if (!(card->dpram = ioremap(card->membase, ERG_DPRAM_PAGE_SIZE)))
if (!(card->dpram = ioremap(card->membase, ERG_DPRAM_PAGE_SIZE))) {
release_region(card->iobase + PCI9050_INTR_REG, 1);
release_region(card->iobase + PCI9050_USER_IO, 1);
return (-1);
}
request_region(card->iobase + PCI9050_INTR_REG, 1, "HYSDN");
request_region(card->iobase + PCI9050_USER_IO, 1, "HYSDN");
ergo_stopcard(card); /* disable interrupts */
if (request_irq(card->irq, ergo_interrupt, SA_SHIRQ, "HYSDN", card)) {
ergo_releasehardware(card); /* return the acquired hardware */
......
......@@ -273,7 +273,7 @@ if [ ! "$CONFIG_PPP" = "n" ]; then
dep_tristate ' PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP
fi
if [ ! "$CONFIG_ATM" = "n" ]; then
dep_tristate ' PPP over ATM (EXPERIMENTAL)' CONFIG_PPPOATM $CONFIG_PPP
dep_tristate ' PPP over ATM' CONFIG_PPPOATM $CONFIG_PPP
fi
fi
......
......@@ -25,7 +25,7 @@ obj-$(CONFIG_PCMCIA_XIRTULIP) += crc32.o
obj-$(CONFIG_PCNET32) += crc32.o
obj-$(CONFIG_SIS900) += crc32.o
obj-$(CONFIG_SMC9194) += crc32.o
obj-$(CONFIG_STARFIRE) += crc32.o
obj-$(CONFIG_ADAPTEC_STARFIRE) += crc32.o
obj-$(CONFIG_SUNBMAC) += crc32.o
obj-$(CONFIG_SUNDANCE) += crc32.o
obj-$(CONFIG_SUNGEM) += crc32.o
......
......@@ -819,9 +819,9 @@ au1000_probe1(struct net_device *dev, long ioaddr, int irq, int port_num)
MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS));
if (dev->priv != NULL)
kfree(dev->priv);
kfree(dev);
printk(KERN_ERR "%s: au1000_probe1 failed. Returns %d\n",
dev->name, retval);
kfree(dev);
return retval;
}
......
......@@ -476,19 +476,22 @@ static int ser12_open(struct net_device *dev)
if (!dev->base_addr || dev->base_addr > 0x1000-SER12_EXTENT ||
dev->irq < 2 || dev->irq > 15)
return -ENXIO;
if (check_region(dev->base_addr, SER12_EXTENT))
if (!request_region(dev->base_addr, SER12_EXTENT, "baycom_ser12"))
return -EACCES;
memset(&bc->modem, 0, sizeof(bc->modem));
bc->hdrv.par.bitrate = 1200;
if ((u = ser12_check_uart(dev->base_addr)) == c_uart_unknown)
if ((u = ser12_check_uart(dev->base_addr)) == c_uart_unknown) {
release_region(dev->base_addr, SER12_EXTENT);
return -EIO;
}
outb(0, FCR(dev->base_addr)); /* disable FIFOs */
outb(0x0d, MCR(dev->base_addr));
outb(0, IER(dev->base_addr));
if (request_irq(dev->irq, ser12_interrupt, SA_INTERRUPT | SA_SHIRQ,
"baycom_ser12", dev))
"baycom_ser12", dev)) {
release_region(dev->base_addr, SER12_EXTENT);
return -EBUSY;
request_region(dev->base_addr, SER12_EXTENT, "baycom_ser12");
}
/*
* enable transmitter empty interrupt
*/
......
......@@ -19,20 +19,20 @@ if [ "$CONFIG_DONGLE" != "n" ]; then
dep_tristate ' EP7211 I/R support' CONFIG_EP7211_IR $CONFIG_IRDA
fi
if [ "$CONFIG_EXPERIMENTAL" != "n" ]; then
dep_tristate ' ACTiSYS IR-200L dongle (Experimental)' CONFIG_ACT200L_DONGLE $CONFIG_IRDA
dep_tristate ' Mobile Action MA600 dongle (Experimental)' CONFIG_MA600_DONGLE $CONFIG_IRDA
dep_tristate ' ACTiSYS IR-200L dongle (EXPERIMENTAL)' CONFIG_ACT200L_DONGLE $CONFIG_IRDA
dep_tristate ' Mobile Action MA600 dongle (EXPERIMENTAL)' CONFIG_MA600_DONGLE $CONFIG_IRDA
fi
fi
comment 'FIR device drivers'
dep_tristate 'IrDA USB dongles (Experimental)' CONFIG_USB_IRDA $CONFIG_IRDA $CONFIG_USB $CONFIG_EXPERIMENTAL
dep_tristate 'IrDA USB dongles (EXPERIMENTAL)' CONFIG_USB_IRDA $CONFIG_IRDA $CONFIG_USB $CONFIG_EXPERIMENTAL
dep_tristate 'NSC PC87108/PC87338' CONFIG_NSC_FIR $CONFIG_IRDA
dep_tristate 'Winbond W83977AF (IR)' CONFIG_WINBOND_FIR $CONFIG_IRDA
dep_tristate 'Toshiba Type-O IR Port' CONFIG_TOSHIBA_FIR $CONFIG_IRDA
if [ "$CONFIG_EXPERIMENTAL" != "n" ]; then
dep_tristate 'SMC IrCC (Experimental)' CONFIG_SMC_IRCC_FIR $CONFIG_IRDA
dep_tristate 'ALi M5123 FIR (Experimental)' CONFIG_ALI_FIR $CONFIG_IRDA
dep_tristate 'VLSI 82C147 SIR/MIR/FIR (Experimental)' CONFIG_VLSI_FIR $CONFIG_IRDA
dep_tristate 'SMC IrCC (EXPERIMENTAL)' CONFIG_SMC_IRCC_FIR $CONFIG_IRDA
dep_tristate 'ALi M5123 FIR (EXPERIMENTAL)' CONFIG_ALI_FIR $CONFIG_IRDA
dep_tristate 'VLSI 82C147 SIR/MIR/FIR (EXPERIMENTAL)' CONFIG_VLSI_FIR $CONFIG_IRDA
fi
if [ "$CONFIG_ARCH_SA1100" = "y" ]; then
dep_tristate 'SA1100 Internal IR' CONFIG_SA1100_FIR $CONFIG_IRDA
......
......@@ -1878,6 +1878,7 @@ void scsi_error_handler(void *data)
*/
daemonize();
reparent_to_init();
/*
* Set the name of this process.
......
......@@ -110,10 +110,6 @@ static const struct fb_videomode modedb[] __initdata = {
/* 1280x1024 @ 87 Hz interlaced, 51 kHz hsync */
NULL, 87, 1280, 1024, 12500, 56, 16, 128, 1, 216, 12,
0, FB_VMODE_INTERLACED
}, {
/* 1400x1050 @ 60Hz, 63.9 kHz hsync */
NULL, 68, 1400, 1050, 9259, 136, 40, 13, 1, 112, 3,
0, FB_VMODE_NONINTERLACED
}, {
/* 800x600 @ 100 Hz, 64.02 kHz hsync */
NULL, 100, 800, 600, 14357, 160, 64, 30, 4, 64, 6,
......
......@@ -26,7 +26,7 @@ dep_tristate 'Apple Macintosh file system support (EXPERIMENTAL)' CONFIG_HFS_FS
dep_tristate 'BFS file system support (EXPERIMENTAL)' CONFIG_BFS_FS $CONFIG_EXPERIMENTAL
tristate 'Ext3 journalling file system support (EXPERIMENTAL)' CONFIG_EXT3_FS
tristate 'Ext3 journalling file system support' CONFIG_EXT3_FS
# CONFIG_JBD could be its own option (even modular), but until there are
# other users than ext3, we will simply make it be the same as CONFIG_EXT3_FS
# dep_tristate ' Journal Block Device support (JBD for ext3)' CONFIG_JBD $CONFIG_EXT3_FS
......
......@@ -269,6 +269,7 @@ static void smbiod_doio(struct smb_sb_info *server)
set_bit(SMBIOD_DATA_READY, &smbiod_flags);
out:
return;
}
/*
......
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