summaryrefslogtreecommitdiffstats
path: root/fs/umsdos
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-12-16 05:34:03 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-12-16 05:34:03 +0000
commit967c65a99059fd459b956c1588ce0ba227912c4e (patch)
tree8224d013ff5d255420713d05610c7efebd204d2a /fs/umsdos
parente20c1cc1656a66a2773bca4591a895cbc12696ff (diff)
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'fs/umsdos')
-rw-r--r--fs/umsdos/emd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/umsdos/emd.c b/fs/umsdos/emd.c
index a40f3bbeb..86002ddeb 100644
--- a/fs/umsdos/emd.c
+++ b/fs/umsdos/emd.c
@@ -29,7 +29,7 @@ long umsdos_file_read_kmem (struct inode *inode,
unsigned long count)
{
int ret;
- unsigned long old_fs = get_fs();
+ mm_segment_t old_fs = get_fs();
set_fs (KERNEL_DS);
ret = fat_file_read(inode,filp,buf,count);
set_fs (old_fs);
@@ -44,7 +44,7 @@ long umsdos_file_write_kmem (struct inode *inode,
unsigned long count)
{
int ret;
- unsigned long old_fs = get_fs();
+ mm_segment_t old_fs = get_fs();
set_fs (KERNEL_DS);
ret = fat_file_write(inode,filp,buf,count);
set_fs (old_fs);