From b1e73cf208d1d23bc55ccb5da4da86a2b4fd12b9 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Tue, 17 Oct 2006 22:51:15 +0000 Subject: [PATCH] another patch from linux-mips' linux-2.6.18-stable tree svn path=/dists/trunk/linux-2.6/; revision=7625 --- debian/changelog | 1 + .../bugfix/mips/compat_sys_mount.patch | 40 +++++++++++++++++++ debian/patches/series/3 | 1 + 3 files changed, 42 insertions(+) create mode 100644 debian/patches/bugfix/mips/compat_sys_mount.patch diff --git a/debian/changelog b/debian/changelog index 095a35427..91f450324 100644 --- a/debian/changelog +++ b/debian/changelog @@ -109,6 +109,7 @@ linux-2.6 (2.6.18-3) UNRELEASED; urgency=low - Workaround for bug in gcc -EB / -EL options - Do not use -msym32 option for modules - Fix O32 personality(2) call with 0xffffffff argument + - Use compat_sys_mount [ dann frazier ] * [ia64]: Fix booting on HP cell systems, thanks to Troy Heber diff --git a/debian/patches/bugfix/mips/compat_sys_mount.patch b/debian/patches/bugfix/mips/compat_sys_mount.patch new file mode 100644 index 000000000..c39567322 --- /dev/null +++ b/debian/patches/bugfix/mips/compat_sys_mount.patch @@ -0,0 +1,40 @@ +From: Ralf Baechle +Date: Mon, 16 Oct 2006 15:49:37 +0000 (+0100) +Subject: [MIPS] Use compat_sys_mount. +X-Git-Tag: linux-2.6.18.1^0~1 +X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=6b80e7725f91669a39853b5b4cd9c6599acce7ef;hp=55ceaed731ab2d60d855ebec59586fa3a327eebb + +[MIPS] Use compat_sys_mount. + +This fixes mount problems with smbfs, ncpfs and NFSv4. + +Signed-off-by: Ralf Baechle +(cherry picked from 0b2177d236a233461f9830b51d8fc4f71ad60d43 commit) +--- + +diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S +index f25c2a2..7960f97 100644 +--- a/arch/mips/kernel/scall64-n32.S ++++ b/arch/mips/kernel/scall64-n32.S +@@ -280,7 +280,7 @@ EXPORT(sysn32_call_table) + PTR sys_sync + PTR sys_acct + PTR sys32_settimeofday +- PTR sys_mount /* 6160 */ ++ PTR compat_sys_mount /* 6160 */ + PTR sys_umount + PTR sys_swapon + PTR sys_swapoff +diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S +index 288ee4a..51284b8 100644 +--- a/arch/mips/kernel/scall64-o32.S ++++ b/arch/mips/kernel/scall64-o32.S +@@ -226,7 +226,7 @@ sys_call_table: + PTR sys_ni_syscall /* was sys_stat */ + PTR sys_lseek + PTR sys_getpid /* 4020 */ +- PTR sys_mount ++ PTR compat_sys_mount + PTR sys_oldumount + PTR sys_setuid + PTR sys_getuid diff --git a/debian/patches/series/3 b/debian/patches/series/3 index 0e5dd5db1..83391de27 100644 --- a/debian/patches/series/3 +++ b/debian/patches/series/3 @@ -7,6 +7,7 @@ + bugfix/mips/workaround_gcc_options.patch + bugfix/mips/modules_msym32.patch + bugfix/mips/o32_personality.patch ++ bugfix/mips/compat_sys_mount.patch + bugfix/sky2-receive-FIFO-fix.patch + features/all/drivers/scsi-ahci-cleanup-1.patch + features/all/drivers/scsi-ahci-cleanup-2.patch