r2313 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series
Frederik Schüler
fschueler-guest@costa.debian.org
Mon, 17 Jan 2005 17:25:42 +0100
Author: fschueler-guest
Date: 2005-01-17 17:25:41 +0100 (Mon, 17 Jan 2005)
New Revision: 2313
Added:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/amd64-quotactl.dpatch
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sata-nv-fix.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-13
Log:
Backport 32bit userland 64bit amd64 kernel quotaclt support
backport sata-nv detection fix
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2005-01-17 16:22:15 UTC (rev 2312)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2005-01-17 16:25:41 UTC (rev 2313)
@@ -18,14 +18,18 @@
* [SECURITY] 035-do_brk_security_fixes-2.dpatch
Further do_brk fixes; just to be safe, lock everywhere do_brk
is used (Andres Salomon).
-
+
* Apply patch to fix compat cmsg_len checks (Christoph Hellwig).
* Backport EFI partition support fixes from 2.6.10. Patch supplied by Tore
Anderson <tore@debian.org> (Christoph Hellwig) (closes: #281905).
-
- -- Norbert Tretkowski <nobse@debian.org> Thu, 13 Jan 2005 17:23:35 +0100
+ * Backport amd64 32bit quotactl support from 2.6.10. (Frederik Schüler)
+
+ * Backport sata-nv device detection fix from 2.6.10. (Frederik Schüler)
+
+ -- Frederik Schüler <fschueler@gmx.net> Mon, 17 Jan 2005 07:54:12 +0100
+
kernel-source-2.6.8 (2.6.8-12) unstable; urgency=high
* [powerpc - prep] Fix bad irq assignement for pci devices on motorola
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/amd64-quotactl.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/amd64-quotactl.dpatch 2005-01-17 16:22:15 UTC (rev 2312)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/amd64-quotactl.dpatch 2005-01-17 16:25:41 UTC (rev 2313)
@@ -0,0 +1,67 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: fix 32bit quota support with 64bit amd64 kernel
+## DP: Patch author: Andi Kleen <ak@suse.de>
+## DP: Upstream status: backport from 2.6.10
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/11/02 15:04:51-08:00 ak@suse.de
+# [PATCH] x86_64: Add 32bit quota support
+#
+# [untested, but other 64bit ports seem to get away with it]
+#
+# sys_quotactl seems to be 32/64bit clean, enable it for 32bit.
+#
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# arch/x86_64/ia32/ia32entry.S
+# 2004/11/02 06:41:12-08:00 ak@suse.de +1 -1
+# x86_64: Add 32bit quota support
+#
+# arch/x86_64/ia32/sys_ia32.c
+# 2004/11/02 06:41:12-08:00 ak@suse.de +0 -12
+# x86_64: Add 32bit quota support
+#
+diff -Nru a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
+--- a/arch/x86_64/ia32/ia32entry.S 2005-01-16 16:09:23 -08:00
++++ b/arch/x86_64/ia32/ia32entry.S 2005-01-16 16:09:23 -08:00
+@@ -433,7 +433,7 @@
+ .quad sys_init_module
+ .quad sys_delete_module
+ .quad quiet_ni_syscall /* 130 get_kernel_syms */
+- .quad sys32_quotactl /* quotactl */
++ .quad sys_quotactl
+ .quad sys_getpgid
+ .quad sys_fchdir
+ .quad quiet_ni_syscall /* bdflush */
+diff -Nru a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
+--- a/arch/x86_64/ia32/sys_ia32.c 2005-01-16 16:09:23 -08:00
++++ b/arch/x86_64/ia32/sys_ia32.c 2005-01-16 16:09:23 -08:00
+@@ -1331,18 +1331,6 @@
+ return -ENOSYS;
+ }
+
+-long sys32_quotactl(void)
+-{
+- struct task_struct *me = current;
+- static char lastcomm[8];
+- if (strcmp(lastcomm, me->comm)) {
+- printk(KERN_INFO "%s: 32bit quotactl not supported on 64 bit kernel\n",
+- me->comm);
+- strcpy(lastcomm, me->comm);
+- }
+- return -ENOSYS;
+-}
+-
+ long sys32_lookup_dcookie(u32 addr_low, u32 addr_high,
+ char __user * buf, size_t len)
+ {
+
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sata-nv-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sata-nv-fix.dpatch 2005-01-17 16:22:15 UTC (rev 2312)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sata-nv-fix.dpatch 2005-01-17 16:25:41 UTC (rev 2313)
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## nv-sata-fix.dpatch by <fschueler@gmx.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: fix sata-nv device detection
+## DP: Patch author: jgarzik@pobox.com
+## DP: Upstream status: backport from 2.6.10
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/12/22 18:58:50-05:00 jgarzik@pobox.com
+# [libata sata_nv] fix dev detect by removing sata-reset flag
+#
+# Remove ATA_FLAG_SATA_RESET. See comment in code and
+# http://bugme.osdl.org/show_bug.cgi?id=3352 for more details.
+#
+# This problem needs more investigation. Removing the flag
+# appears to fix the problems in the field, so it's the best
+# temporary solution.
+#
+# drivers/scsi/sata_nv.c
+# 2004/12/22 18:58:44-05:00 jgarzik@pobox.com +9 -1
+# [libata sata_nv] fix dev detect by removing sata-reset flag
+#
+# Remove ATA_FLAG_SATA_RESET. See comment in code and
+# http://bugme.osdl.org/show_bug.cgi?id=3352 for more details.
+#
+# This problem needs more investigation. Removing the flag
+# appears to fix the problems in the field, so it's the best
+# temporary solution.
+#
+diff -Nru a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
+--- a/drivers/scsi/sata_nv.c 2005-01-16 22:49:58 -08:00
++++ b/drivers/scsi/sata_nv.c 2005-01-16 22:49:58 -08:00
+@@ -218,10 +218,18 @@
+ .host_stop = nv_host_stop,
+ };
+
++/* FIXME: The hardware provides the necessary SATA PHY controls
++ * to support ATA_FLAG_SATA_RESET. However, it is currently
++ * necessary to disable that flag, to solve misdetection problems.
++ * See http://bugme.osdl.org/show_bug.cgi?id=3352 for more info.
++ *
++ * This problem really needs to be investigated further. But in the
++ * meantime, we avoid ATA_FLAG_SATA_RESET to get people working.
++ */
+ static struct ata_port_info nv_port_info = {
+ .sht = &nv_sht,
+ .host_flags = ATA_FLAG_SATA |
+- ATA_FLAG_SATA_RESET |
++ /* ATA_FLAG_SATA_RESET | */
+ ATA_FLAG_SRST |
+ ATA_FLAG_NO_LEGACY,
+ .pio_mask = NV_PIO_MASK,
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-13
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-13 2005-01-17 16:22:15 UTC (rev 2312)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-13 2005-01-17 16:25:41 UTC (rev 2313)
@@ -5,3 +5,5 @@
+ 035-do_brk_security_fixes-2.dpatch
+ cmsg-compat-signedness-fix-fix.dpatch
+ fs-partitions-efi-update.dpatch
++ amd64-quotactl.dpatch
++ sata-nv-fix.dpatch