Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-07-31 22:31:26 -0700
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-07-31 22:31:26 -0700
commitd383ba51a478fbcaa37ab09af9bd8b1433028801 (patch)
tree0380bd6c05e64f391a806ff1c97583e2dda084a5
parent0e94855881664384004a6b310b1a80d528751c06 (diff)
parentbccdb12ca468f698fc7b61a00d1b8b225399c5e7 (diff)
Merge with Rusty 'trivial' Russell
-rw-r--r--MAINTAINERS5
-rw-r--r--arch/i386/kernel/apic.c2
-rw-r--r--arch/i386/kernel/i386_ksyms.c1
-rw-r--r--arch/i386/kernel/io_apic.c4
-rw-r--r--arch/ia64/config.in8
-rw-r--r--arch/ppc/8260_io/Config.in2
-rw-r--r--drivers/char/drm/mga_drv.h2
-rw-r--r--drivers/char/ftape/zftape/zftape-init.c2
-rw-r--r--drivers/char/rocket.c21
-rw-r--r--drivers/isdn/hisax/Config.in4
-rw-r--r--drivers/isdn/hysdn/boardergo.c15
-rw-r--r--drivers/net/Config.in2
-rw-r--r--drivers/net/Makefile.lib2
-rw-r--r--drivers/net/au1000_eth.c2
-rw-r--r--drivers/net/hamradio/baycom_ser_hdx.c11
-rw-r--r--drivers/net/irda/Config.in12
-rw-r--r--drivers/scsi/scsi_error.c1
-rw-r--r--drivers/video/modedb.c4
-rw-r--r--fs/Config.in2
-rw-r--r--fs/smbfs/smbiod.c1
-rw-r--r--fs/ufs/super.c2
-rw-r--r--include/asm-alpha/socket.h2
-rw-r--r--include/asm-arm/socket.h2
-rw-r--r--include/asm-i386/socket.h2
-rw-r--r--include/asm-i386/spinlock.h2
-rw-r--r--include/asm-ia64/socket.h2
-rw-r--r--include/asm-m68k/socket.h2
-rw-r--r--include/asm-mips/socket.h2
-rw-r--r--include/asm-mips64/socket.h2
-rw-r--r--include/asm-parisc/socket.h2
-rw-r--r--include/asm-ppc/socket.h2
-rw-r--r--include/asm-s390/socket.h2
-rw-r--r--include/asm-sh/socket.h2
-rw-r--r--include/asm-sparc/socket.h2
-rw-r--r--include/asm-sparc64/socket.h2
-rw-r--r--include/linux/dqblk_xfs.h6
-rw-r--r--include/linux/mm.h2
-rw-r--r--include/linux/signal.h1
-rw-r--r--kernel/futex.c8
-rw-r--r--kernel/kmod.c14
-rw-r--r--kernel/module.c34
-rw-r--r--kernel/platform.c14
-rw-r--r--kernel/sched.c2
-rw-r--r--kernel/sys.c2
-rw-r--r--kernel/sysctl.c6
-rw-r--r--kernel/user.c6
-rw-r--r--mm/slab.c2
-rw-r--r--net/ipv4/ipconfig.c2
-rw-r--r--net/sched/sch_ingress.c4
49 files changed, 122 insertions, 114 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ebcd5fe6fa67..ce805507932e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c
index a864800e1f3c..be2f19bf4d03 100644
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
@@ -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();
}
diff --git a/arch/i386/kernel/i386_ksyms.c b/arch/i386/kernel/i386_ksyms.c
index 2b6ba73e1fd9..d31b096b4da7 100644
--- a/arch/i386/kernel/i386_ksyms.c
+++ b/arch/i386/kernel/i386_ksyms.c
@@ -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 */
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index a2ca84337699..8944f668e984 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -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;
}
diff --git a/arch/ia64/config.in b/arch/ia64/config.in
index e8b206238104..fc54b622b779 100644
--- a/arch/ia64/config.in
+++ b/arch/ia64/config.in
@@ -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
diff --git a/arch/ppc/8260_io/Config.in b/arch/ppc/8260_io/Config.in
index 20eeaeae50fc..c47b35052cc6 100644
--- a/arch/ppc/8260_io/Config.in
+++ b/arch/ppc/8260_io/Config.in
@@ -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
diff --git a/drivers/char/drm/mga_drv.h b/drivers/char/drm/mga_drv.h
index ba2602e73b50..1f5d9675583a 100644
--- a/drivers/char/drm/mga_drv.h
+++ b/drivers/char/drm/mga_drv.h
@@ -38,7 +38,7 @@ typedef struct drm_mga_primary_buffer {
u32 tail;
int space;
- volatile int wrapped;
+ volatile long wrapped;
volatile u32 *status;
diff --git a/drivers/char/ftape/zftape/zftape-init.c b/drivers/char/ftape/zftape/zftape-init.c
index da92cbbbf0a4..8d120c757ae3 100644
--- a/drivers/char/ftape/zftape/zftape-init.c
+++ b/drivers/char/ftape/zftape/zftape-init.c
@@ -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;
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 6513edfc3045..4b1509ea7eb9 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -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);
}
diff --git a/drivers/isdn/hisax/Config.in b/drivers/isdn/hisax/Config.in
index 0d41ba9998df..997a2f255f66 100644
--- a/drivers/isdn/hisax/Config.in
+++ b/drivers/isdn/hisax/Config.in
@@ -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
diff --git a/drivers/isdn/hysdn/boardergo.c b/drivers/isdn/hysdn/boardergo.c
index 67c245a886c3..aae47971c5f0 100644
--- a/drivers/isdn/hysdn/boardergo.c
+++ b/drivers/isdn/hysdn/boardergo.c
@@ -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 */
diff --git a/drivers/net/Config.in b/drivers/net/Config.in
index c15e62b48281..c4104bab7f78 100644
--- a/drivers/net/Config.in
+++ b/drivers/net/Config.in
@@ -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
diff --git a/drivers/net/Makefile.lib b/drivers/net/Makefile.lib
index af22a0e02a3a..ed26632be260 100644
--- a/drivers/net/Makefile.lib
+++ b/drivers/net/Makefile.lib
@@ -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
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index aab50f6e2219..64c2b53a6413 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -819,9 +819,9 @@ free_region:
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;
}
diff --git a/drivers/net/hamradio/baycom_ser_hdx.c b/drivers/net/hamradio/baycom_ser_hdx.c
index 9c860f1e5ef3..14e18b0b1df0 100644
--- a/drivers/net/hamradio/baycom_ser_hdx.c
+++ b/drivers/net/hamradio/baycom_ser_hdx.c
@@ -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
*/
diff --git a/drivers/net/irda/Config.in b/drivers/net/irda/Config.in
index 36d973f32956..19f98192ae06 100644
--- a/drivers/net/irda/Config.in
+++ b/drivers/net/irda/Config.in
@@ -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
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 11d9307d20f0..1c364e823c87 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1878,6 +1878,7 @@ void scsi_error_handler(void *data)
*/
daemonize();
+ reparent_to_init();
/*
* Set the name of this process.
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index b8b70836a5e6..16d0aeb9184d 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -111,10 +111,6 @@ static const struct fb_videomode modedb[] __initdata = {
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,
0, FB_VMODE_NONINTERLACED
diff --git a/fs/Config.in b/fs/Config.in
index ffb3b91725c0..1c8e8253459e 100644
--- a/fs/Config.in
+++ b/fs/Config.in
@@ -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
diff --git a/fs/smbfs/smbiod.c b/fs/smbfs/smbiod.c
index 98e5bae274f2..732449552331 100644
--- a/fs/smbfs/smbiod.c
+++ b/fs/smbfs/smbiod.c
@@ -269,6 +269,7 @@ static void smbiod_doio(struct smb_sb_info *server)
set_bit(SMBIOD_DATA_READY, &smbiod_flags);
out:
+ return;
}
/*
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index a046374ab085..c60ae7e1fcde 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -673,7 +673,7 @@ magic_found:
}
if (uspi->s_bsize < 4096) {
printk("ufs_read_super: block size %u is too small\n",
- uspi->s_fsize);
+ uspi->s_bsize);
goto failed;
}
if (uspi->s_bsize / uspi->s_fsize > 8) {
diff --git a/include/asm-alpha/socket.h b/include/asm-alpha/socket.h
index 07a63df9024e..e821ac372464 100644
--- a/include/asm-alpha/socket.h
+++ b/include/asm-alpha/socket.h
@@ -3,7 +3,7 @@
#include <asm/sockios.h>
-/* For setsockoptions(2) */
+/* For setsockopt(2) */
/*
* Note: we only bother about making the SOL_SOCKET options
* same as OSF/1, as that's all that "normal" programs are
diff --git a/include/asm-arm/socket.h b/include/asm-arm/socket.h
index 1e09a6483716..5c1428e41b06 100644
--- a/include/asm-arm/socket.h
+++ b/include/asm-arm/socket.h
@@ -3,7 +3,7 @@
#include <asm/sockios.h>
-/* For setsockoptions(2) */
+/* For setsockopt(2) */
#define SOL_SOCKET 1
#define SO_DEBUG 1
diff --git a/include/asm-i386/socket.h b/include/asm-i386/socket.h
index fbcc44d3430e..525f83218cd8 100644
--- a/include/asm-i386/socket.h
+++ b/include/asm-i386/socket.h
@@ -3,7 +3,7 @@
#include <asm/sockios.h>
-/* For setsockoptions(2) */
+/* For setsockopt(2) */
#define SOL_SOCKET 1
#define SO_DEBUG 1
diff --git a/include/asm-i386/spinlock.h b/include/asm-i386/spinlock.h
index 678a64fed800..d565c78c2d81 100644
--- a/include/asm-i386/spinlock.h
+++ b/include/asm-i386/spinlock.h
@@ -39,7 +39,7 @@ typedef struct {
* We make no fairness assumptions. They have a cost.
*/
-#define spin_is_locked(x) (*(volatile char *)(&(x)->lock) <= 0)
+#define spin_is_locked(x) (*(volatile signed char *)(&(x)->lock) <= 0)
#define spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x))
#define spin_lock_string \
diff --git a/include/asm-ia64/socket.h b/include/asm-ia64/socket.h
index 8e75850169af..01e3b50760d3 100644
--- a/include/asm-ia64/socket.h
+++ b/include/asm-ia64/socket.h
@@ -10,7 +10,7 @@
#include <asm/sockios.h>
-/* For setsockoptions(2) */
+/* For setsockopt(2) */
#define SOL_SOCKET 1
#define SO_DEBUG 1
diff --git a/include/asm-m68k/socket.h b/include/asm-m68k/socket.h
index a328c84b9f23..1959b608d477 100644
--- a/include/asm-m68k/socket.h
+++ b/include/asm-m68k/socket.h
@@ -3,7 +3,7 @@
#include <asm/sockios.h>
-/* For setsockoptions(2) */
+/* For setsockopt(2) */
#define SOL_SOCKET 1
#define SO_DEBUG 1
diff --git a/include/asm-mips/socket.h b/include/asm-mips/socket.h
index b8a570fa0af9..7288078773e1 100644
--- a/include/asm-mips/socket.h
+++ b/include/asm-mips/socket.h
@@ -4,7 +4,7 @@
#include <asm/sockios.h>
/*
- * For setsockoptions(2)
+ * For setsockopt(2)
*
* This defines are ABI conformant as far as Linux supports these ...
*/
diff --git a/include/asm-mips64/socket.h b/include/asm-mips64/socket.h
index e1e69473022e..df9fcb53d71e 100644
--- a/include/asm-mips64/socket.h
+++ b/include/asm-mips64/socket.h
@@ -12,7 +12,7 @@
#include <asm/sockios.h>
/*
- * For setsockoptions(2)
+ * For setsockopt(2)
*
* This defines are ABI conformant as far as Linux supports these ...
*/
diff --git a/include/asm-parisc/socket.h b/include/asm-parisc/socket.h
index a292ad715eb2..7833ff68f2e4 100644
--- a/include/asm-parisc/socket.h
+++ b/include/asm-parisc/socket.h
@@ -3,7 +3,7 @@
#include <asm/sockios.h>
-/* For setsockoptions(2) */
+/* For setsockopt(2) */
#define SOL_SOCKET 0xffff
#define SO_DEBUG 0x0001
diff --git a/include/asm-ppc/socket.h b/include/asm-ppc/socket.h
index 6d233588f599..beccec2431fb 100644
--- a/include/asm-ppc/socket.h
+++ b/include/asm-ppc/socket.h
@@ -12,7 +12,7 @@
#define SIOCATMARK 0x8905
#define SIOCGSTAMP 0x8906 /* Get stamp */
-/* For setsockoptions(2) */
+/* For setsockopt(2) */
#define SOL_SOCKET 1
#define SO_DEBUG 1
diff --git a/include/asm-s390/socket.h b/include/asm-s390/socket.h
index 5576c366b35d..d7b7f5bb6a39 100644
--- a/include/asm-s390/socket.h
+++ b/include/asm-s390/socket.h
@@ -11,7 +11,7 @@
#include <asm/sockios.h>
-/* For setsockoptions(2) */
+/* For setsockopt(2) */
#define SOL_SOCKET 1
#define SO_DEBUG 1
diff --git a/include/asm-sh/socket.h b/include/asm-sh/socket.h
index e668153e67b9..918e2f225959 100644
--- a/include/asm-sh/socket.h
+++ b/include/asm-sh/socket.h
@@ -3,7 +3,7 @@
#include <asm/sockios.h>
-/* For setsockoptions(2) */
+/* For setsockopt(2) */
#define SOL_SOCKET 1
#define SO_DEBUG 1
diff --git a/include/asm-sparc/socket.h b/include/asm-sparc/socket.h
index 9521e1386eb8..254d446bdcf9 100644
--- a/include/asm-sparc/socket.h
+++ b/include/asm-sparc/socket.h
@@ -4,7 +4,7 @@
#include <asm/sockios.h>
-/* For setsockoptions(2) */
+/* For setsockopt(2) */
#define SOL_SOCKET 0xffff
#define SO_DEBUG 0x0001
diff --git a/include/asm-sparc64/socket.h b/include/asm-sparc64/socket.h
index fb99636b12be..d041e3352970 100644
--- a/include/asm-sparc64/socket.h
+++ b/include/asm-sparc64/socket.h
@@ -4,7 +4,7 @@
#include <asm/sockios.h>
-/* For setsockoptions(2) */
+/* For setsockopt(2) */
#define SOL_SOCKET 0xffff
#define SO_DEBUG 0x0001
diff --git a/include/linux/dqblk_xfs.h b/include/linux/dqblk_xfs.h
index d077bc18a424..ab4ee81a94e9 100644
--- a/include/linux/dqblk_xfs.h
+++ b/include/linux/dqblk_xfs.h
@@ -30,8 +30,8 @@
*
* http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
*/
-#ifndef _LINUX_XQM_H
-#define _LINUX_XQM_H
+#ifndef _LINUX_DQBLK_XFS_H
+#define _LINUX_DQBLK_XFS_H
#include <linux/types.h>
@@ -156,4 +156,4 @@ typedef struct fs_quota_stat {
__u16 qs_iwarnlimit; /* limit for num warnings */
} fs_quota_stat_t;
-#endif /* _LINUX_XQM_H */
+#endif /* _LINUX_DQBLK_XFS_H */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 747312505986..8cfa042a42fc 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -401,8 +401,6 @@ extern void swapin_readahead(swp_entry_t);
extern int can_share_swap_page(struct page *);
extern int remove_exclusive_swap_page(struct page *);
-extern void __free_pte(pte_t);
-
/* mmap.c */
extern void lock_vma_mappings(struct vm_area_struct *);
extern void unlock_vma_mappings(struct vm_area_struct *);
diff --git a/include/linux/signal.h b/include/linux/signal.h
index 1f1fbb1254eb..4209f934d03f 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -221,6 +221,7 @@ static inline void init_sigpending(struct sigpending *sig)
extern long do_sigpending(void *, unsigned long);
#ifndef HAVE_ARCH_GET_SIGNAL_TO_DELIVER
+struct pt_regs;
extern int get_signal_to_deliver(siginfo_t *info, struct pt_regs *regs);
#endif
diff --git a/kernel/futex.c b/kernel/futex.c
index dca7e1a84864..ef3dc8b00a5f 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -245,8 +245,8 @@ static unsigned int futex_poll(struct file *filp,
}
static struct file_operations futex_fops = {
- release: futex_close,
- poll: futex_poll,
+ .release = futex_close,
+ .poll = futex_poll,
};
/* Signal allows caller to avoid the race which would occur if they
@@ -357,8 +357,8 @@ futexfs_get_sb(struct file_system_type *fs_type,
}
static struct file_system_type futex_fs_type = {
- name: "futexfs",
- get_sb: futexfs_get_sb,
+ .name = "futexfs",
+ .get_sb = futexfs_get_sb,
};
static int __init init(void)
diff --git a/kernel/kmod.c b/kernel/kmod.c
index d063d20001a4..53dd3ca194c3 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -346,15 +346,15 @@ int call_usermodehelper(char *path, char **argv, char **envp)
{
DECLARE_COMPLETION(work);
struct subprocess_info sub_info = {
- complete: &work,
- path: path,
- argv: argv,
- envp: envp,
- retval: 0,
+ .complete = &work,
+ .path = path,
+ .argv = argv,
+ .envp = envp,
+ .retval = 0,
};
struct tq_struct tqs = {
- routine: __call_usermodehelper,
- data: &sub_info,
+ .routine = __call_usermodehelper,
+ .data = &sub_info,
};
if (path[0] == '\0')
diff --git a/kernel/module.c b/kernel/module.c
index 8d2f2a46de0e..b9e8e9190944 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -44,15 +44,15 @@ extern const char __stop___kallsyms[] __attribute__ ((weak));
struct module kernel_module =
{
- size_of_struct: sizeof(struct module),
- name: "",
- uc: {ATOMIC_INIT(1)},
- flags: MOD_RUNNING,
- syms: __start___ksymtab,
- ex_table_start: __start___ex_table,
- ex_table_end: __stop___ex_table,
- kallsyms_start: __start___kallsyms,
- kallsyms_end: __stop___kallsyms,
+ .size_of_struct = sizeof(struct module),
+ .name = "",
+ .uc = {ATOMIC_INIT(1)},
+ .flags = MOD_RUNNING,
+ .syms = __start___ksymtab,
+ .ex_table_start = __start___ex_table,
+ .ex_table_end = __stop___ex_table,
+ .kallsyms_start = __start___kallsyms,
+ .kallsyms_end = __stop___kallsyms,
};
struct module *module_list = &kernel_module;
@@ -1132,10 +1132,10 @@ static int m_show(struct seq_file *m, void *p)
return 0;
}
struct seq_operations modules_op = {
- start: m_start,
- next: m_next,
- stop: m_stop,
- show: m_show
+ .start = m_start,
+ .next = m_next,
+ .stop = m_stop,
+ .show = m_show
};
/*
@@ -1214,10 +1214,10 @@ static int s_show(struct seq_file *m, void *p)
}
struct seq_operations ksyms_op = {
- start: s_start,
- next: s_next,
- stop: s_stop,
- show: s_show
+ .start = s_start,
+ .next = s_next,
+ .stop = s_stop,
+ .show = s_show
};
#else /* CONFIG_MODULES */
diff --git a/kernel/platform.c b/kernel/platform.c
index 9848541526a6..66eb41af168d 100644
--- a/kernel/platform.c
+++ b/kernel/platform.c
@@ -23,13 +23,13 @@ int default_suspend(int state, int flags)
}
static struct platform_t default_platform = {
- name: "Default Platform",
- suspend_states: 0,
- reboot: default_reboot,
- halt: default_halt,
- power_off: default_halt,
- suspend: default_suspend,
- idle: default_idle,
+ .name = "Default Platform",
+ .suspend_states = 0,
+ .reboot = default_reboot,
+ .halt = default_halt,
+ .power_off = default_halt,
+ .suspend = default_suspend,
+ .idle = default_idle,
};
struct platform_t * platform = &default_platform;
diff --git a/kernel/sched.c b/kernel/sched.c
index 12e54306d4c0..c196fbddbab9 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1963,7 +1963,7 @@ out:
*/
static int migration_thread(void * data)
{
- struct sched_param param = { sched_priority: MAX_RT_PRIO-1 };
+ struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
int cpu = (long) data;
runqueue_t *rq;
int ret;
diff --git a/kernel/sys.c b/kernel/sys.c
index 37a9525b3f1d..316a63de74ea 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -391,7 +391,7 @@ static void deferred_cad(void *dummy)
void ctrl_alt_del(void)
{
static struct tq_struct cad_tq = {
- routine: deferred_cad,
+ .routine = deferred_cad,
};
if (C_A_D)
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 7317c78306c3..4b9619033b07 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -126,12 +126,12 @@ static ssize_t proc_writesys(struct file *, const char *, size_t, loff_t *);
static int proc_sys_permission(struct inode *, int);
struct file_operations proc_sys_file_operations = {
- read: proc_readsys,
- write: proc_writesys,
+ .read = proc_readsys,
+ .write = proc_writesys,
};
static struct inode_operations proc_sys_inode_operations = {
- permission: proc_sys_permission,
+ .permission = proc_sys_permission,
};
extern struct proc_dir_entry *proc_sys_root;
diff --git a/kernel/user.c b/kernel/user.c
index c77f52ea9cff..752cda29c965 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -28,9 +28,9 @@ static struct list_head uidhash_table[UIDHASH_SZ];
static spinlock_t uidhash_lock = SPIN_LOCK_UNLOCKED;
struct user_struct root_user = {
- __count: ATOMIC_INIT(1),
- processes: ATOMIC_INIT(1),
- files: ATOMIC_INIT(0)
+ .__count = ATOMIC_INIT(1),
+ .processes = ATOMIC_INIT(1),
+ .files = ATOMIC_INIT(0)
};
/*
diff --git a/mm/slab.c b/mm/slab.c
index c35c347a094e..f15e274aba6c 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -126,7 +126,7 @@
* Bufctl's are used for linking objs within a slab
* linked offsets.
*
- * This implementaion relies on "struct page" for locating the cache &
+ * This implementation relies on "struct page" for locating the cache &
* slab an object belongs to.
* This allows the bufctl structure to be small (one int), but limits
* the number of objects a slab (not a cache) can contain when off-slab
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 4ee3ed1be090..e2d3fbd665a2 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -469,7 +469,7 @@ drop:
/*
- * Send RARP request packet over a signle interface.
+ * Send RARP request packet over a single interface.
*/
static void __init ic_rarp_send_if(struct ic_device *d)
{
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 7ef8543de0e5..6f3d7152cf56 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -106,7 +106,7 @@ static int ingress_change(struct Qdisc *sch, u32 classid, u32 parent,
#endif
DPRINTK("ingress_change(sch %p,[qdisc %p],classid %x,parent %x),"
"arg 0x%lx\n", sch, p, classid, parent, *arg);
- DPRINTK("No effect. sch_ingress doesnt maintain classes at the moment");
+ DPRINTK("No effect. sch_ingress doesn't maintain classes at the moment");
return 0;
}
@@ -118,7 +118,7 @@ static void ingress_walk(struct Qdisc *sch,struct qdisc_walker *walker)
struct ingress_qdisc_data *p = PRIV(sch);
#endif
DPRINTK("ingress_walk(sch %p,[qdisc %p],walker %p)\n", sch, p, walker);
- DPRINTK("No effect. sch_ingress doesnt maintain classes at the moment");
+ DPRINTK("No effect. sch_ingress doesn't maintain classes at the moment");
}