Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
d383ba51
Commit
d383ba51
authored
Jul 31, 2002
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge with Rusty 'trivial' Russell
parents
0e948558
bccdb12c
Changes
49
Show whitespace changes
Inline
Side-by-side
Showing
49 changed files
with
122 additions
and
114 deletions
+122
-114
MAINTAINERS
MAINTAINERS
+4
-1
arch/i386/kernel/apic.c
arch/i386/kernel/apic.c
+1
-1
arch/i386/kernel/i386_ksyms.c
arch/i386/kernel/i386_ksyms.c
+1
-0
arch/i386/kernel/io_apic.c
arch/i386/kernel/io_apic.c
+2
-2
arch/ia64/config.in
arch/ia64/config.in
+4
-4
arch/ppc/8260_io/Config.in
arch/ppc/8260_io/Config.in
+1
-1
drivers/char/drm/mga_drv.h
drivers/char/drm/mga_drv.h
+1
-1
drivers/char/ftape/zftape/zftape-init.c
drivers/char/ftape/zftape/zftape-init.c
+1
-1
drivers/char/rocket.c
drivers/char/rocket.c
+11
-10
drivers/isdn/hisax/Config.in
drivers/isdn/hisax/Config.in
+2
-2
drivers/isdn/hysdn/boardergo.c
drivers/isdn/hysdn/boardergo.c
+9
-6
drivers/net/Config.in
drivers/net/Config.in
+1
-1
drivers/net/Makefile.lib
drivers/net/Makefile.lib
+1
-1
drivers/net/au1000_eth.c
drivers/net/au1000_eth.c
+1
-1
drivers/net/hamradio/baycom_ser_hdx.c
drivers/net/hamradio/baycom_ser_hdx.c
+7
-4
drivers/net/irda/Config.in
drivers/net/irda/Config.in
+6
-6
drivers/scsi/scsi_error.c
drivers/scsi/scsi_error.c
+1
-0
drivers/video/modedb.c
drivers/video/modedb.c
+0
-4
fs/Config.in
fs/Config.in
+1
-1
fs/smbfs/smbiod.c
fs/smbfs/smbiod.c
+1
-0
fs/ufs/super.c
fs/ufs/super.c
+1
-1
include/asm-alpha/socket.h
include/asm-alpha/socket.h
+1
-1
include/asm-arm/socket.h
include/asm-arm/socket.h
+1
-1
include/asm-i386/socket.h
include/asm-i386/socket.h
+1
-1
include/asm-i386/spinlock.h
include/asm-i386/spinlock.h
+1
-1
include/asm-ia64/socket.h
include/asm-ia64/socket.h
+1
-1
include/asm-m68k/socket.h
include/asm-m68k/socket.h
+1
-1
include/asm-mips/socket.h
include/asm-mips/socket.h
+1
-1
include/asm-mips64/socket.h
include/asm-mips64/socket.h
+1
-1
include/asm-parisc/socket.h
include/asm-parisc/socket.h
+1
-1
include/asm-ppc/socket.h
include/asm-ppc/socket.h
+1
-1
include/asm-s390/socket.h
include/asm-s390/socket.h
+1
-1
include/asm-sh/socket.h
include/asm-sh/socket.h
+1
-1
include/asm-sparc/socket.h
include/asm-sparc/socket.h
+1
-1
include/asm-sparc64/socket.h
include/asm-sparc64/socket.h
+1
-1
include/linux/dqblk_xfs.h
include/linux/dqblk_xfs.h
+3
-3
include/linux/mm.h
include/linux/mm.h
+0
-2
include/linux/signal.h
include/linux/signal.h
+1
-0
kernel/futex.c
kernel/futex.c
+4
-4
kernel/kmod.c
kernel/kmod.c
+7
-7
kernel/module.c
kernel/module.c
+17
-17
kernel/platform.c
kernel/platform.c
+7
-7
kernel/sched.c
kernel/sched.c
+1
-1
kernel/sys.c
kernel/sys.c
+1
-1
kernel/sysctl.c
kernel/sysctl.c
+3
-3
kernel/user.c
kernel/user.c
+3
-3
mm/slab.c
mm/slab.c
+1
-1
net/ipv4/ipconfig.c
net/ipv4/ipconfig.c
+1
-1
net/sched/sch_ingress.c
net/sched/sch_ingress.c
+2
-2
No files found.
MAINTAINERS
View file @
d383ba51
...
...
@@ -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
...
...
arch/i386/kernel/apic.c
View file @
d383ba51
...
...
@@ -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
();
}
...
...
arch/i386/kernel/i386_ksyms.c
View file @
d383ba51
...
...
@@ -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 */
...
...
arch/i386/kernel/io_apic.c
View file @
d383ba51
...
...
@@ -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
;
}
...
...
arch/ia64/config.in
View file @
d383ba51
...
...
@@ -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
...
...
arch/ppc/8260_io/Config.in
View file @
d383ba51
...
...
@@ -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
...
...
drivers/char/drm/mga_drv.h
View file @
d383ba51
...
...
@@ -38,7 +38,7 @@ typedef struct drm_mga_primary_buffer {
u32
tail
;
int
space
;
volatile
int
wrapped
;
volatile
long
wrapped
;
volatile
u32
*
status
;
...
...
drivers/char/ftape/zftape/zftape-init.c
View file @
d383ba51
...
...
@@ -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
;
...
...
drivers/char/rocket.c
View file @
d383ba51
...
...
@@ -1881,13 +1881,21 @@ 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
]
=
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
);
}
...
...
drivers/isdn/hisax/Config.in
View file @
d383ba51
...
...
@@ -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
...
...
drivers/isdn/hysdn/boardergo.c
View file @
d383ba51
...
...
@@ -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 */
...
...
drivers/net/Config.in
View file @
d383ba51
...
...
@@ -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
...
...
drivers/net/Makefile.lib
View file @
d383ba51
...
...
@@ -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
...
...
drivers/net/au1000_eth.c
View file @
d383ba51
...
...
@@ -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
;
}
...
...
drivers/net/hamradio/baycom_ser_hdx.c
View file @
d383ba51
...
...
@@ -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
*/
...
...
drivers/net/irda/Config.in
View file @
d383ba51
...
...
@@ -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 (E
xperimental
)' CONFIG_ACT200L_DONGLE $CONFIG_IRDA
dep_tristate ' Mobile Action MA600 dongle (E
xperimental
)' CONFIG_MA600_DONGLE $CONFIG_IRDA
dep_tristate ' ACTiSYS IR-200L dongle (E
XPERIMENTAL
)' CONFIG_ACT200L_DONGLE $CONFIG_IRDA
dep_tristate ' Mobile Action MA600 dongle (E
XPERIMENTAL
)' CONFIG_MA600_DONGLE $CONFIG_IRDA
fi
fi
comment 'FIR device drivers'
dep_tristate 'IrDA USB dongles (E
xperimental
)' CONFIG_USB_IRDA $CONFIG_IRDA $CONFIG_USB $CONFIG_EXPERIMENTAL
dep_tristate 'IrDA USB dongles (E
XPERIMENTAL
)' 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 (E
xperimental
)' CONFIG_SMC_IRCC_FIR $CONFIG_IRDA
dep_tristate 'ALi M5123 FIR (E
xperimental
)' CONFIG_ALI_FIR $CONFIG_IRDA
dep_tristate 'VLSI 82C147 SIR/MIR/FIR (E
xperimental
)' CONFIG_VLSI_FIR $CONFIG_IRDA
dep_tristate 'SMC IrCC (E
XPERIMENTAL
)' CONFIG_SMC_IRCC_FIR $CONFIG_IRDA
dep_tristate 'ALi M5123 FIR (E
XPERIMENTAL
)' CONFIG_ALI_FIR $CONFIG_IRDA
dep_tristate 'VLSI 82C147 SIR/MIR/FIR (E
XPERIMENTAL
)' CONFIG_VLSI_FIR $CONFIG_IRDA
fi
if [ "$CONFIG_ARCH_SA1100" = "y" ]; then
dep_tristate 'SA1100 Internal IR' CONFIG_SA1100_FIR $CONFIG_IRDA
...
...
drivers/scsi/scsi_error.c
View file @
d383ba51
...
...
@@ -1878,6 +1878,7 @@ void scsi_error_handler(void *data)
*/
daemonize
();
reparent_to_init
();
/*
* Set the name of this process.
...
...
drivers/video/modedb.c
View file @
d383ba51
...
...
@@ -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
,
...
...
fs/Config.in
View file @
d383ba51
...
...
@@ -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
...
...
fs/smbfs/smbiod.c
View file @
d383ba51
...
...
@@ -269,6 +269,7 @@ static void smbiod_doio(struct smb_sb_info *server)
set_bit
(
SMBIOD_DATA_READY
,
&
smbiod_flags
);
out:
return
;
}
/*
...
...
fs/ufs/super.c
View file @
d383ba51
...
...
@@ -673,7 +673,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
}
if
(
uspi
->
s_bsize
<
4096
)
{
printk
(
"ufs_read_super: block size %u is too small
\n
"
,
uspi
->
s_
f
size
);
uspi
->
s_
b
size
);
goto
failed
;
}
if
(
uspi
->
s_bsize
/
uspi
->
s_fsize
>
8
)
{
...
...
include/asm-alpha/socket.h
View file @
d383ba51
...
...
@@ -3,7 +3,7 @@
#include <asm/sockios.h>
/* For setsockopt
ions
(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
...
...
include/asm-arm/socket.h
View file @
d383ba51
...
...
@@ -3,7 +3,7 @@
#include <asm/sockios.h>
/* For setsockopt
ions
(2) */
/* For setsockopt(2) */
#define SOL_SOCKET 1
#define SO_DEBUG 1
...
...
include/asm-i386/socket.h
View file @
d383ba51
...
...
@@ -3,7 +3,7 @@
#include <asm/sockios.h>
/* For setsockopt
ions
(2) */
/* For setsockopt(2) */
#define SOL_SOCKET 1
#define SO_DEBUG 1
...
...
include/asm-i386/spinlock.h
View file @
d383ba51
...
...
@@ -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 \
...
...
include/asm-ia64/socket.h
View file @
d383ba51
...
...
@@ -10,7 +10,7 @@
#include <asm/sockios.h>
/* For setsockopt
ions
(2) */
/* For setsockopt(2) */
#define SOL_SOCKET 1
#define SO_DEBUG 1
...
...
include/asm-m68k/socket.h
View file @
d383ba51
...
...
@@ -3,7 +3,7 @@
#include <asm/sockios.h>
/* For setsockopt
ions
(2) */
/* For setsockopt(2) */
#define SOL_SOCKET 1
#define SO_DEBUG 1
...
...
include/asm-mips/socket.h
View file @
d383ba51
...
...
@@ -4,7 +4,7 @@
#include <asm/sockios.h>
/*
* For setsockopt
ions
(2)
* For setsockopt(2)
*
* This defines are ABI conformant as far as Linux supports these ...
*/
...
...
include/asm-mips64/socket.h
View file @
d383ba51
...
...
@@ -12,7 +12,7 @@
#include <asm/sockios.h>
/*
* For setsockopt
ions
(2)
* For setsockopt(2)
*
* This defines are ABI conformant as far as Linux supports these ...
*/
...
...
include/asm-parisc/socket.h
View file @
d383ba51
...
...
@@ -3,7 +3,7 @@
#include <asm/sockios.h>
/* For setsockopt
ions
(2) */
/* For setsockopt(2) */
#define SOL_SOCKET 0xffff
#define SO_DEBUG 0x0001
...
...
include/asm-ppc/socket.h
View file @
d383ba51
...
...
@@ -12,7 +12,7 @@
#define SIOCATMARK 0x8905
#define SIOCGSTAMP 0x8906
/* Get stamp */
/* For setsockopt
ions
(2) */
/* For setsockopt(2) */
#define SOL_SOCKET 1
#define SO_DEBUG 1
...
...
include/asm-s390/socket.h
View file @
d383ba51
...
...
@@ -11,7 +11,7 @@
#include <asm/sockios.h>
/* For setsockopt
ions
(2) */
/* For setsockopt(2) */
#define SOL_SOCKET 1
#define SO_DEBUG 1
...
...
include/asm-sh/socket.h
View file @
d383ba51
...
...
@@ -3,7 +3,7 @@
#include <asm/sockios.h>
/* For setsockopt
ions
(2) */
/* For setsockopt(2) */
#define SOL_SOCKET 1
#define SO_DEBUG 1
...
...
include/asm-sparc/socket.h
View file @
d383ba51
...
...
@@ -4,7 +4,7 @@
#include <asm/sockios.h>
/* For setsockopt
ions
(2) */
/* For setsockopt(2) */
#define SOL_SOCKET 0xffff
#define SO_DEBUG 0x0001
...
...
include/asm-sparc64/socket.h
View file @
d383ba51
...
...
@@ -4,7 +4,7 @@
#include <asm/sockios.h>
/* For setsockopt
ions
(2) */
/* For setsockopt(2) */
#define SOL_SOCKET 0xffff
#define SO_DEBUG 0x0001
...
...
include/linux/dqblk_xfs.h
View file @
d383ba51
...
...
@@ -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 */
include/linux/mm.h
View file @
d383ba51
...
...
@@ -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
*
);
...
...
include/linux/signal.h
View file @
d383ba51
...
...
@@ -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
...
...
kernel/futex.c
View file @
d383ba51
...
...
@@ -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
)
...
...
kernel/kmod.c
View file @
d383ba51
...
...
@@ -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'
)
...
...
kernel/module.c
View file @
d383ba51
...
...
@@ -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 */
...
...
kernel/platform.c
View file @
d383ba51
...
...
@@ -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
;
...
...
kernel/sched.c
View file @
d383ba51
...
...
@@ -1963,7 +1963,7 @@ void set_cpus_allowed(task_t *p, unsigned long new_mask)
*/
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
;
...
...
kernel/sys.c
View file @
d383ba51
...
...
@@ -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
)
...
...
kernel/sysctl.c
View file @
d383ba51
...
...
@@ -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
;
...
...
kernel/user.c
View file @
d383ba51
...
...
@@ -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
)
};
/*
...
...
mm/slab.c
View file @
d383ba51
...
...
@@ -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 implementa
t
ion 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
...
...
net/ipv4/ipconfig.c
View file @
d383ba51
...
...
@@ -469,7 +469,7 @@ ic_rarp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
/*
* Send RARP request packet over a si
gn
le interface.
* Send RARP request packet over a si
ng
le interface.
*/
static
void
__init
ic_rarp_send_if
(
struct
ic_device
*
d
)
{
...
...
net/sched/sch_ingress.c
View file @
d383ba51
...
...
@@ -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"
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment