The patch titled
files-sparc64-fix
has been added to the -mm tree. Its filename is
files-sparc64-fix.patch
Patches currently in -mm which might be from [EMAIL PROTECTED] are
i2o-config-osm-build-fix.patch
git-drm-via-fixup.patch
git-netdev-janitor-fixup.patch
wireless-device-attr-fixes.patch
wireless-device-attr-fixes-2.patch
ipw2100-old-gcc-fix.patch
ieee80211_module-build-fixes.patch
ieee80211_tx-build-fix.patch
ieee80211_rx-build-fix.patch
ieee80211_crypt-build-fix.patch
ieee80211_crypt_ccmp-build-fix.patch
ieee80211_crypt_wep-build-fix.patch
ieee80211_crypt_tkip-build-fix.patch
revert-gregkh-pci-pci-assign-unassigned-resources.patch
dpt_i2o-warning-fix.patch
aic79xx-ahd_linux_dev_reset-cleanup.patch
bk-watchdog.patch
print-order-information-when-oom-killing-fix.patch
zatm-kfree-fix.patch
e1000-printk-warning-fix-2.patch
net-add-driver-for-the-nic-on-cell-blades-kconfig-fix.patch
ipw2200-build-fix.patch
x86_64-div-by-zero-fix.patch
page_uptodate-locking-scalability-fix.patch
yealink-updates.patch
pselect-ppoll-system-calls-tidy.patch
pselect-ppoll-system-calls-sigset_t-fix-2.patch
pselect-ppoll-system-calls-sigset_t-fix-3.patch
xip-empty_zero_page-build-fix.patch
smsc-ircc2-pm-cleanup-do-not-close-device-when-suspending-fixes.patch
alpha-pgprot_noncached.patch
ib-uverbs-add-mthca-mmap-support-fix.patch
connector-exit-notifier-fix.patch
connector-add-a-fork-connector-use-after-free-fix.patch
jbd-split-checkpoint-lists-tweaks.patch
revert-fix-broken-kmalloc_node-in-rc1-rc2.patch
nr_blockdev_pages-in_interrupt-warning.patch
asfs-filesystem-driver-fixes.patch
reiser4-swsusp-build-fix.patch
reiser4-printk-warning-fix.patch
reiser4-mm-remove-pg_highmem-fix.patch
v9fs-debug-and-support-routines-fix.patch
device-mapper-dm-raid1-limit-bios-to-size-of-mirror-region-fix.patch
From: Andrew Morton <[EMAIL PROTECTED]>
Cc: Dipankar Sarma <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
arch/sparc64/solaris/timod.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff -puN arch/sparc64/solaris/timod.c~files-sparc64-fix
arch/sparc64/solaris/timod.c
--- 25-sparc64/arch/sparc64/solaris/timod.c~files-sparc64-fix 2005-07-06
23:31:27.000000000 -0700
+++ 25-sparc64-akpm/arch/sparc64/solaris/timod.c 2005-07-06
23:33:14.000000000 -0700
@@ -145,7 +145,7 @@ static void timod_wake_socket(unsigned i
struct socket *sock;
SOLD("wakeing socket");
- sock = SOCKET_I(current->files->fd[fd]->f_dentry->d_inode);
+ sock = SOCKET_I(current->files->fdt->fd[fd]->f_dentry->d_inode);
wake_up_interruptible(&sock->wait);
read_lock(&sock->sk->sk_callback_lock);
if (sock->fasync_list && !test_bit(SOCK_ASYNC_WAITDATA, &sock->flags))
@@ -159,7 +159,7 @@ static void timod_queue(unsigned int fd,
struct sol_socket_struct *sock;
SOLD("queuing primsg");
- sock = (struct sol_socket_struct *)current->files->fd[fd]->private_data;
+ sock = current->files->fdt->fd[fd]->private_data;
it->next = sock->pfirst;
sock->pfirst = it;
if (!sock->plast)
@@ -173,7 +173,7 @@ static void timod_queue_end(unsigned int
struct sol_socket_struct *sock;
SOLD("queuing primsg at end");
- sock = (struct sol_socket_struct *)current->files->fd[fd]->private_data;
+ sock = current->files->fdt->fd[fd]->private_data;
it->next = NULL;
if (sock->plast)
sock->plast->next = it;
@@ -351,7 +351,7 @@ int timod_putmsg(unsigned int fd, char _
(int (*)(int, unsigned long __user *))SYS(socketcall);
int (*sys_sendto)(int, void __user *, size_t, unsigned, struct sockaddr
__user *, int) =
(int (*)(int, void __user *, size_t, unsigned, struct sockaddr
__user *, int))SYS(sendto);
- filp = current->files->fd[fd];
+ filp = current->files->fdt->fd[fd];
ino = filp->f_dentry->d_inode;
sock = (struct sol_socket_struct *)filp->private_data;
SOLD("entry");
@@ -632,7 +632,7 @@ int timod_getmsg(unsigned int fd, char _
SOLD("entry");
SOLDD(("%u %p %d %p %p %d %p %d\n", fd, ctl_buf, ctl_maxlen, ctl_len,
data_buf, data_maxlen, data_len, *flags_p));
- filp = current->files->fd[fd];
+ filp = current->files->fdt->fd[fd];
ino = filp->f_dentry->d_inode;
sock = (struct sol_socket_struct *)filp->private_data;
SOLDD(("%p %p\n", sock->pfirst, sock->pfirst ? sock->pfirst->next :
NULL));
@@ -849,7 +849,7 @@ asmlinkage int solaris_getmsg(unsigned i
lock_kernel();
if(fd >= NR_OPEN) goto out;
- filp = current->files->fd[fd];
+ filp = current->files->fdt->fd[fd];
if(!filp) goto out;
ino = filp->f_dentry->d_inode;
@@ -915,7 +915,7 @@ asmlinkage int solaris_putmsg(unsigned i
lock_kernel();
if(fd >= NR_OPEN) goto out;
- filp = current->files->fd[fd];
+ filp = current->files->fdt->fd[fd];
if(!filp) goto out;
ino = filp->f_dentry->d_inode;
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
