git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
sparc64
/
solaris
/
socksys.c
diff --git
a/arch/sparc64/solaris/socksys.c
b/arch/sparc64/solaris/socksys.c
index
e16e64d
..
fc6669e
100644
(file)
--- a/
arch/sparc64/solaris/socksys.c
+++ b/
arch/sparc64/solaris/socksys.c
@@
-49,7
+49,7
@@
IPPROTO_EGP, IPPROTO_PUP, IPPROTO_UDP, IPPROTO_IDP, IPPROTO_RAW,
#else
#else
-extern void * mykmalloc(size_t s,
in
t gfp);
+extern void * mykmalloc(size_t s,
gfp_
t gfp);
extern void mykfree(void *);
#endif
extern void mykfree(void *);
#endif
@@
-150,7
+150,7
@@
static unsigned int socksys_poll(struct file * filp, poll_table * wait)
unsigned int mask = 0;
ino=filp->f_dentry->d_inode;
unsigned int mask = 0;
ino=filp->f_dentry->d_inode;
- if (ino &&
ino->i_sock
) {
+ if (ino &&
S_ISSOCK(ino->i_mode)
) {
struct sol_socket_struct *sock;
sock = (struct sol_socket_struct*)filp->private_data;
if (sock && sock->pfirst) {
struct sol_socket_struct *sock;
sock = (struct sol_socket_struct*)filp->private_data;
if (sock && sock->pfirst) {