Hello community, here is the log from the commit of package kernel-source checked in at Tue Sep 11 21:32:13 CEST 2007. -------- --- kernel-source/kernel-bigsmp.changes 2007-09-07 19:56:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2007-09-11 17:27:46.706536000 +0200 @@ -1,0 +2,22 @@ +Tue Sep 11 16:22:16 CEST 2007 - bwalle@suse.de + +- rpm/post.sh: Don't run mkinitrd during installation (308984) + +------------------------------------------------------------------- +Tue Sep 11 14:51:28 CEST 2007 - jbeulich@novell.com + +- patches.xen/xen-isa-dma: Suppress all use of ISA DMA on Xen. + +------------------------------------------------------------------- +Tue Sep 11 05:46:51 CEST 2007 - jjohanse@suse.de + +- patches.apparmor/apparmor-log-audit-type.diff: log audit + message type so it is present in syslog (304491). + +------------------------------------------------------------------- +Mon Sep 10 15:22:19 CEST 2007 - olh@suse.de + +- add patches.arch/ppc-prom-nodisplay.patch + new prom=nodisplay option to avoid crash in firmware on B50 + +------------------------------------------------------------------- @@ -164 +186 @@ -Wed Aug 29 14:08:18 CEST 2007 - khali@linux-fr.org +Wed Aug 29 14:08:18 CEST 2007 - jdelvare@suse.de kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.changes: same change kernel-kdump.changes: same change kernel-ppc64.changes: same change kernel-rt.changes: same change kernel-rt_debug.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-bigsmp.spec ++++++ --- /var/tmp/diff_new_pack.t25755/_old 2007-09-11 21:27:43.000000000 +0200 +++ /var/tmp/diff_new_pack.t25755/_new 2007-09-11 21:27:43.000000000 +0200 @@ -39,7 +39,7 @@ %endif Summary: Kernel with PAE Support Version: 2.6.22.5 -Release: 13 +Release: 15 License: GPL v2 or later Group: System/Kernel Autoreqprov: on @@ -170,7 +170,7 @@ -Source Timestamp: 2007/09/07 17:46:00 UTC +Source Timestamp: 2007/09/11 14:25:31 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -561,6 +561,16 @@ %files -f kernel.files %changelog +* Tue Sep 11 2007 - bwalle@suse.de +- rpm/post.sh: Don't run mkinitrd during installation (308984) +* Tue Sep 11 2007 - jbeulich@novell.com +- patches.xen/xen-isa-dma: Suppress all use of ISA DMA on Xen. +* Tue Sep 11 2007 - jjohanse@suse.de +- patches.apparmor/apparmor-log-audit-type.diff: log audit + message type so it is present in syslog (304491). +* Mon Sep 10 2007 - olh@suse.de +- add patches.arch/ppc-prom-nodisplay.patch + new prom=nodisplay option to avoid crash in firmware on B50 * Fri Sep 07 2007 - jdelvare@suse.de - patches.suse/bootsplash: Add missing newline at end of log messages and missing prefix at the beginning of log messages. @@ -667,7 +677,7 @@ to represent an ACL but no previous ACL existed. * Wed Aug 29 2007 - jeffm@suse.de - Enabled CONFIG_PARAVIRT and CONFIG_VMI (282026). -* Wed Aug 29 2007 - khali@linux-fr.org +* Wed Aug 29 2007 - jdelvare@suse.de - supported.conf: Update the list of hwmon drivers (all unsupported). - supported.conf: Update the list of i2c bus drivers (all kernel-debug.spec: same change kernel-default.spec: same change ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.t25755/_old 2007-09-11 21:27:43.000000000 +0200 +++ /var/tmp/diff_new_pack.t25755/_new 2007-09-11 21:27:43.000000000 +0200 @@ -15,7 +15,7 @@ URL: http://www.kernel.org/ Summary: Internal dummy package for synchronizing release numbers Version: 2.6.22.5 -Release: 13 +Release: 15 License: GPL v2 or later Group: System/Kernel Autoreqprov: off @@ -28,7 +28,7 @@ -------- Andreas Gruenbacher <agruen@suse.de> -Source Timestamp: 2007/09/07 17:46:00 UTC +Source Timestamp: 2007/09/11 14:25:31 UTC %install @@ -41,6 +41,16 @@ /etc/dummy %changelog +* Tue Sep 11 2007 - bwalle@suse.de +- rpm/post.sh: Don't run mkinitrd during installation (308984) +* Tue Sep 11 2007 - jbeulich@novell.com +- patches.xen/xen-isa-dma: Suppress all use of ISA DMA on Xen. +* Tue Sep 11 2007 - jjohanse@suse.de +- patches.apparmor/apparmor-log-audit-type.diff: log audit + message type so it is present in syslog (304491). +* Mon Sep 10 2007 - olh@suse.de +- add patches.arch/ppc-prom-nodisplay.patch + new prom=nodisplay option to avoid crash in firmware on B50 * Fri Sep 07 2007 - jdelvare@suse.de - patches.suse/bootsplash: Add missing newline at end of log messages and missing prefix at the beginning of log messages. @@ -147,7 +157,7 @@ to represent an ACL but no previous ACL existed. * Wed Aug 29 2007 - jeffm@suse.de - Enabled CONFIG_PARAVIRT and CONFIG_VMI (282026). -* Wed Aug 29 2007 - khali@linux-fr.org +* Wed Aug 29 2007 - jdelvare@suse.de - supported.conf: Update the list of hwmon drivers (all unsupported). - supported.conf: Update the list of i2c bus drivers (all ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.t25755/_old 2007-09-11 21:27:44.000000000 +0200 +++ /var/tmp/diff_new_pack.t25755/_new 2007-09-11 21:27:44.000000000 +0200 @@ -39,7 +39,7 @@ %endif Summary: kernel for kdump Version: 2.6.22.5 -Release: 13 +Release: 15 License: GPL v2 or later Group: System/Kernel Autoreqprov: on @@ -174,7 +174,7 @@ -Source Timestamp: 2007/09/07 17:46:00 UTC +Source Timestamp: 2007/09/11 14:25:31 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -565,6 +565,16 @@ %files -f kernel.files %changelog +* Tue Sep 11 2007 - bwalle@suse.de +- rpm/post.sh: Don't run mkinitrd during installation (308984) +* Tue Sep 11 2007 - jbeulich@novell.com +- patches.xen/xen-isa-dma: Suppress all use of ISA DMA on Xen. +* Tue Sep 11 2007 - jjohanse@suse.de +- patches.apparmor/apparmor-log-audit-type.diff: log audit + message type so it is present in syslog (304491). +* Mon Sep 10 2007 - olh@suse.de +- add patches.arch/ppc-prom-nodisplay.patch + new prom=nodisplay option to avoid crash in firmware on B50 * Fri Sep 07 2007 - jdelvare@suse.de - patches.suse/bootsplash: Add missing newline at end of log messages and missing prefix at the beginning of log messages. @@ -671,7 +681,7 @@ to represent an ACL but no previous ACL existed. * Wed Aug 29 2007 - jeffm@suse.de - Enabled CONFIG_PARAVIRT and CONFIG_VMI (282026). -* Wed Aug 29 2007 - khali@linux-fr.org +* Wed Aug 29 2007 - jdelvare@suse.de - supported.conf: Update the list of hwmon drivers (all unsupported). - supported.conf: Update the list of i2c bus drivers (all ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.t25755/_old 2007-09-11 21:27:44.000000000 +0200 +++ /var/tmp/diff_new_pack.t25755/_new 2007-09-11 21:27:44.000000000 +0200 @@ -38,7 +38,7 @@ %endif Summary: Kernel for ppc64 Systems Version: 2.6.22.5 -Release: 13 +Release: 15 License: GPL v2 or later, LGPL v2 or later Group: System/Kernel Autoreqprov: on @@ -186,7 +186,7 @@ Tom Gall <tom_gall@vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/09/07 17:46:00 UTC +Source Timestamp: 2007/09/11 14:25:31 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -577,6 +577,16 @@ %files -f kernel.files %changelog +* Tue Sep 11 2007 - bwalle@suse.de +- rpm/post.sh: Don't run mkinitrd during installation (308984) +* Tue Sep 11 2007 - jbeulich@novell.com +- patches.xen/xen-isa-dma: Suppress all use of ISA DMA on Xen. +* Tue Sep 11 2007 - jjohanse@suse.de +- patches.apparmor/apparmor-log-audit-type.diff: log audit + message type so it is present in syslog (304491). +* Mon Sep 10 2007 - olh@suse.de +- add patches.arch/ppc-prom-nodisplay.patch + new prom=nodisplay option to avoid crash in firmware on B50 * Fri Sep 07 2007 - jdelvare@suse.de - patches.suse/bootsplash: Add missing newline at end of log messages and missing prefix at the beginning of log messages. @@ -683,7 +693,7 @@ to represent an ACL but no previous ACL existed. * Wed Aug 29 2007 - jeffm@suse.de - Enabled CONFIG_PARAVIRT and CONFIG_VMI (282026). -* Wed Aug 29 2007 - khali@linux-fr.org +* Wed Aug 29 2007 - jdelvare@suse.de - supported.conf: Update the list of hwmon drivers (all unsupported). - supported.conf: Update the list of i2c bus drivers (all ++++++ kernel-rt_debug.spec ++++++ --- /var/tmp/diff_new_pack.t25755/_old 2007-09-11 21:27:44.000000000 +0200 +++ /var/tmp/diff_new_pack.t25755/_new 2007-09-11 21:27:44.000000000 +0200 @@ -39,7 +39,7 @@ %endif Summary: A Debug Version of the Kernel Version: 2.6.22.5 -Release: 13 +Release: 15 License: GPL v2 or later Group: System/Kernel Autoreqprov: on @@ -172,7 +172,7 @@ -Source Timestamp: 2007/09/07 17:46:00 UTC +Source Timestamp: 2007/09/11 14:25:31 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -563,6 +563,16 @@ %files -f kernel.files %changelog +* Tue Sep 11 2007 - bwalle@suse.de +- rpm/post.sh: Don't run mkinitrd during installation (308984) +* Tue Sep 11 2007 - jbeulich@novell.com +- patches.xen/xen-isa-dma: Suppress all use of ISA DMA on Xen. +* Tue Sep 11 2007 - jjohanse@suse.de +- patches.apparmor/apparmor-log-audit-type.diff: log audit + message type so it is present in syslog (304491). +* Mon Sep 10 2007 - olh@suse.de +- add patches.arch/ppc-prom-nodisplay.patch + new prom=nodisplay option to avoid crash in firmware on B50 * Fri Sep 07 2007 - jdelvare@suse.de - patches.suse/bootsplash: Add missing newline at end of log messages and missing prefix at the beginning of log messages. @@ -669,7 +679,7 @@ to represent an ACL but no previous ACL existed. * Wed Aug 29 2007 - jeffm@suse.de - Enabled CONFIG_PARAVIRT and CONFIG_VMI (282026). -* Wed Aug 29 2007 - khali@linux-fr.org +* Wed Aug 29 2007 - jdelvare@suse.de - supported.conf: Update the list of hwmon drivers (all unsupported). - supported.conf: Update the list of i2c bus drivers (all ++++++ kernel-rt.spec ++++++ --- /var/tmp/diff_new_pack.t25755/_old 2007-09-11 21:27:44.000000000 +0200 +++ /var/tmp/diff_new_pack.t25755/_new 2007-09-11 21:27:44.000000000 +0200 @@ -39,7 +39,7 @@ %endif Summary: The Realtime Linux Kernel Version: 2.6.22.5 -Release: 13 +Release: 15 License: GPL v2 or later Group: System/Kernel Autoreqprov: on @@ -188,7 +188,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/09/07 17:46:00 UTC +Source Timestamp: 2007/09/11 14:25:31 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -579,6 +579,16 @@ %files -f kernel.files %changelog +* Tue Sep 11 2007 - bwalle@suse.de +- rpm/post.sh: Don't run mkinitrd during installation (308984) +* Tue Sep 11 2007 - jbeulich@novell.com +- patches.xen/xen-isa-dma: Suppress all use of ISA DMA on Xen. +* Tue Sep 11 2007 - jjohanse@suse.de +- patches.apparmor/apparmor-log-audit-type.diff: log audit + message type so it is present in syslog (304491). +* Mon Sep 10 2007 - olh@suse.de +- add patches.arch/ppc-prom-nodisplay.patch + new prom=nodisplay option to avoid crash in firmware on B50 * Fri Sep 07 2007 - jdelvare@suse.de - patches.suse/bootsplash: Add missing newline at end of log messages and missing prefix at the beginning of log messages. @@ -685,7 +695,7 @@ to represent an ACL but no previous ACL existed. * Wed Aug 29 2007 - jeffm@suse.de - Enabled CONFIG_PARAVIRT and CONFIG_VMI (282026). -* Wed Aug 29 2007 - khali@linux-fr.org +* Wed Aug 29 2007 - jdelvare@suse.de - supported.conf: Update the list of hwmon drivers (all unsupported). - supported.conf: Update the list of i2c bus drivers (all ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.t25755/_old 2007-09-11 21:27:45.000000000 +0200 +++ /var/tmp/diff_new_pack.t25755/_new 2007-09-11 21:27:45.000000000 +0200 @@ -39,7 +39,7 @@ %endif Summary: The Standard Kernel Version: 2.6.22.5 -Release: 8 +Release: 9 License: GPL v2 or later Group: System/Kernel Autoreqprov: on @@ -168,7 +168,7 @@ -Source Timestamp: 2007/09/07 17:46:00 UTC +Source Timestamp: 2007/09/11 14:25:31 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -559,6 +559,16 @@ %files -f kernel.files %changelog +* Tue Sep 11 2007 - bwalle@suse.de +- rpm/post.sh: Don't run mkinitrd during installation (308984) +* Tue Sep 11 2007 - jbeulich@novell.com +- patches.xen/xen-isa-dma: Suppress all use of ISA DMA on Xen. +* Tue Sep 11 2007 - jjohanse@suse.de +- patches.apparmor/apparmor-log-audit-type.diff: log audit + message type so it is present in syslog (304491). +* Mon Sep 10 2007 - olh@suse.de +- add patches.arch/ppc-prom-nodisplay.patch + new prom=nodisplay option to avoid crash in firmware on B50 * Fri Sep 07 2007 - jdelvare@suse.de - patches.suse/bootsplash: Add missing newline at end of log messages and missing prefix at the beginning of log messages. @@ -665,7 +675,7 @@ to represent an ACL but no previous ACL existed. * Wed Aug 29 2007 - jeffm@suse.de - Enabled CONFIG_PARAVIRT and CONFIG_VMI (282026). -* Wed Aug 29 2007 - khali@linux-fr.org +* Wed Aug 29 2007 - jdelvare@suse.de - supported.conf: Update the list of hwmon drivers (all unsupported). - supported.conf: Update the list of i2c bus drivers (all ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.t25755/_old 2007-09-11 21:27:45.000000000 +0200 +++ /var/tmp/diff_new_pack.t25755/_new 2007-09-11 21:27:45.000000000 +0200 @@ -22,7 +22,7 @@ %endif Summary: The Linux Kernel Sources Version: 2.6.22.5 -Release: 13 +Release: 15 License: GPL v2 only Group: Development/Sources Autoreqprov: off @@ -106,7 +106,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/09/07 17:46:00 UTC +Source Timestamp: 2007/09/11 14:25:31 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -281,6 +281,16 @@ %files -f kernel-source.files %changelog +* Tue Sep 11 2007 - bwalle@suse.de +- rpm/post.sh: Don't run mkinitrd during installation (308984) +* Tue Sep 11 2007 - jbeulich@novell.com +- patches.xen/xen-isa-dma: Suppress all use of ISA DMA on Xen. +* Tue Sep 11 2007 - jjohanse@suse.de +- patches.apparmor/apparmor-log-audit-type.diff: log audit + message type so it is present in syslog (304491). +* Mon Sep 10 2007 - olh@suse.de +- add patches.arch/ppc-prom-nodisplay.patch + new prom=nodisplay option to avoid crash in firmware on B50 * Fri Sep 07 2007 - jdelvare@suse.de - patches.suse/bootsplash: Add missing newline at end of log messages and missing prefix at the beginning of log messages. @@ -387,7 +397,7 @@ to represent an ACL but no previous ACL existed. * Wed Aug 29 2007 - jeffm@suse.de - Enabled CONFIG_PARAVIRT and CONFIG_VMI (282026). -* Wed Aug 29 2007 - khali@linux-fr.org +* Wed Aug 29 2007 - jdelvare@suse.de - supported.conf: Update the list of hwmon drivers (all unsupported). - supported.conf: Update the list of i2c bus drivers (all ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.t25755/_old 2007-09-11 21:27:45.000000000 +0200 +++ /var/tmp/diff_new_pack.t25755/_new 2007-09-11 21:27:45.000000000 +0200 @@ -21,7 +21,7 @@ %endif Summary: Kernel Symbol Versions (modversions) Version: 2.6.22.5 -Release: 13 +Release: 15 License: GPL v2 or later Group: Development/Sources Autoreqprov: off @@ -96,7 +96,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/09/07 17:46:00 UTC +Source Timestamp: 2007/09/11 14:25:31 UTC %prep echo "Architecture symbol(s):" %symbols @@ -150,6 +150,16 @@ /lib/modules/*/* %changelog +* Tue Sep 11 2007 - bwalle@suse.de +- rpm/post.sh: Don't run mkinitrd during installation (308984) +* Tue Sep 11 2007 - jbeulich@novell.com +- patches.xen/xen-isa-dma: Suppress all use of ISA DMA on Xen. +* Tue Sep 11 2007 - jjohanse@suse.de +- patches.apparmor/apparmor-log-audit-type.diff: log audit + message type so it is present in syslog (304491). +* Mon Sep 10 2007 - olh@suse.de +- add patches.arch/ppc-prom-nodisplay.patch + new prom=nodisplay option to avoid crash in firmware on B50 * Fri Sep 07 2007 - jdelvare@suse.de - patches.suse/bootsplash: Add missing newline at end of log messages and missing prefix at the beginning of log messages. @@ -256,7 +266,7 @@ to represent an ACL but no previous ACL existed. * Wed Aug 29 2007 - jeffm@suse.de - Enabled CONFIG_PARAVIRT and CONFIG_VMI (282026). -* Wed Aug 29 2007 - khali@linux-fr.org +* Wed Aug 29 2007 - jdelvare@suse.de - supported.conf: Update the list of hwmon drivers (all unsupported). - supported.conf: Update the list of i2c bus drivers (all ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.t25755/_old 2007-09-11 21:27:45.000000000 +0200 +++ /var/tmp/diff_new_pack.t25755/_new 2007-09-11 21:27:45.000000000 +0200 @@ -39,7 +39,7 @@ %endif Summary: The Standard Kernel - without any SUSE patches Version: 2.6.22.5 -Release: 13 +Release: 15 License: GPL v2 or later Group: System/Kernel Autoreqprov: on @@ -188,7 +188,7 @@ -Source Timestamp: 2007/09/07 17:46:00 UTC +Source Timestamp: 2007/09/11 14:25:31 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -579,6 +579,16 @@ %files -f kernel.files %changelog +* Tue Sep 11 2007 - bwalle@suse.de +- rpm/post.sh: Don't run mkinitrd during installation (308984) +* Tue Sep 11 2007 - jbeulich@novell.com +- patches.xen/xen-isa-dma: Suppress all use of ISA DMA on Xen. +* Tue Sep 11 2007 - jjohanse@suse.de +- patches.apparmor/apparmor-log-audit-type.diff: log audit + message type so it is present in syslog (304491). +* Mon Sep 10 2007 - olh@suse.de +- add patches.arch/ppc-prom-nodisplay.patch + new prom=nodisplay option to avoid crash in firmware on B50 * Fri Sep 07 2007 - jdelvare@suse.de - patches.suse/bootsplash: Add missing newline at end of log messages and missing prefix at the beginning of log messages. @@ -685,7 +695,7 @@ to represent an ACL but no previous ACL existed. * Wed Aug 29 2007 - jeffm@suse.de - Enabled CONFIG_PARAVIRT and CONFIG_VMI (282026). -* Wed Aug 29 2007 - khali@linux-fr.org +* Wed Aug 29 2007 - jdelvare@suse.de - supported.conf: Update the list of hwmon drivers (all unsupported). - supported.conf: Update the list of i2c bus drivers (all kernel-xenpae.spec: same change kernel-xen.spec: same change ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2007-09-07 19:56:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2007-09-11 17:27:41.930305000 +0200 @@ -1 +1 @@ -2007/09/07 17:46:00 UTC +2007/09/11 14:25:31 UTC ++++++ config.tar.bz2 ++++++ ++++++ kabi.tar.bz2 ++++++ ++++++ needed_space_in_mb ++++++ --- kernel-source/needed_space_in_mb 2007-09-10 12:40:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/needed_space_in_mb 2007-09-11 17:28:09.657548000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ novell-kmp.tar.bz2 ++++++ ++++++ patches.apparmor.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/apparmor-log-audit-type.diff new/patches.apparmor/apparmor-log-audit-type.diff --- old/patches.apparmor/apparmor-log-audit-type.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.apparmor/apparmor-log-audit-type.diff 2007-09-11 06:47:20.000000000 +0200 @@ -0,0 +1,30 @@ +From: John Johnansen <jjohansen@suse.de> +Subject: log audit message type so it is present in syslog +Patch-mainline: no +References: 304491 + +Audit messages that go to syslog don't contain the audit type, which +the apparmor tools use to classify messages. This patch logs the audit +type as part of the AppArmor message so it is present in messages sent +to syslog. + +Signed-off-by: John Johansen <jjohansen@suse.de> + +--- + security/apparmor/main.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/security/apparmor/main.c ++++ b/security/apparmor/main.c +@@ -326,8 +326,10 @@ static int aa_audit_base(struct aa_profi + return type == AUDIT_APPARMOR_ALLOWED ? 0 : -ENOMEM; + } + ++ audit_log_format(ab, " type=%d", type); ++ + if (sa->operation) +- audit_log_format(ab, "operation=\"%s\"", sa->operation); ++ audit_log_format(ab, " operation=\"%s\"", sa->operation); + + if (sa->info) + audit_log_format(ab, " info=\"%s\"", sa->info); ++++++ patches.arch.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-prom-nodisplay.patch new/patches.arch/ppc-prom-nodisplay.patch --- old/patches.arch/ppc-prom-nodisplay.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/ppc-prom-nodisplay.patch 2007-09-10 15:22:54.000000000 +0200 @@ -0,0 +1,83 @@ +add prom=nodisplay +avoid crash in firmware on IBM B50 when OF stdout is on serial. + + 0 > boot scsi/sd@4:1,yaboot | +yaboot starting: loaded at 00200000 00222530 (0/0/00c1a078; sp: 00efffd0) +brokenfirmware did not claim executable memory, fixed it myself +Config file 'yaboot.cnf' read, 213 bytes + +Welcome to yaboot version 10.1.22-r945.SuSE +booted from '/pci@80000000/scsi@10/sd@4:1,yaboot' +Enter "help" to get some basic usage information +boot: +* linux +boot: linux 3 +Please wait, loading kernel... +Allocated 00600000 bytes for executable @ 02000000 + Elf32 kernel loaded... +Loading ramdisk... +ramdisk loaded 0030e057 @ 04100000 +OF stdout device is: /pci@80000000/isa@b/serial@i3f8 +command line: root=/dev/system/root xmon=on sysrq=1 quiet panic=12 3 +memory layout at init: + memory_limit : 00000000 (16 MB aligned) + alloc_bottom : 0440f000 + alloc_top : 30000000 + alloc_top_hi : 40000000 + rmo_top : 30000000 + ram_top : 40000000 +Looking for displays +found display : /pci@80000000/display@16, opening ... +Unexpected Firmware Error: +DEFAULT CATCH!, code=fff00300 at %SRR0: 00c18ccc %SRR1: 00003030 + ok + 0 > reset-all + + +--- + arch/powerpc/kernel/prom_init.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +--- a/arch/powerpc/kernel/prom_init.c ++++ b/arch/powerpc/kernel/prom_init.c +@@ -172,6 +172,7 @@ static unsigned long __initdata dt_strin + + static unsigned long __initdata prom_initrd_start, prom_initrd_end; + ++static int __initdata prom_no_display; + #ifdef CONFIG_PPC64 + static int __initdata prom_iommu_force_on; + static int __initdata prom_iommu_off; +@@ -557,9 +558,7 @@ unsigned long prom_memparse(const char * + static void __init early_cmdline_parse(void) + { + struct prom_t *_prom = &RELOC(prom); +-#ifdef CONFIG_PPC64 + const char *opt; +-#endif + char *p; + int l = 0; + +@@ -574,6 +573,14 @@ static void __init early_cmdline_parse(v + #endif /* CONFIG_CMDLINE */ + prom_printf("command line: %s\n", RELOC(prom_cmd_line)); + ++ opt = strstr(RELOC(prom_cmd_line), RELOC("prom=")); ++ if (opt) { ++ opt += 5; ++ while (*opt && *opt == ' ') ++ opt++; ++ if (!strncmp(opt, RELOC("nodisplay"), 9)) ++ RELOC(prom_no_display) = 1; ++ } + #ifdef CONFIG_PPC64 + opt = strstr(RELOC(prom_cmd_line), RELOC("iommu=")); + if (opt) { +@@ -2362,6 +2369,7 @@ unsigned long __init prom_init(unsigned + /* + * Initialize display devices + */ ++ if (RELOC(prom_no_display) == 0) + prom_check_displays(); + + #ifdef CONFIG_PPC64 ++++++ patches.drivers.tar.bz2 ++++++ ++++++ patches.fixes.tar.bz2 ++++++ ++++++ patches.kernel.org.tar.bz2 ++++++ ++++++ patches.rpmify.tar.bz2 ++++++ ++++++ patches.rt.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ ++++++ patches.uml.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen-isa-dma new/patches.xen/xen-isa-dma --- old/patches.xen/xen-isa-dma 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.xen/xen-isa-dma 2007-09-11 14:50:37.000000000 +0200 @@ -0,0 +1,543 @@ +From: jbeulich@novell.com +Subject: Suppress all use of ISA DMA on Xen. +Patch-mainline: obsolete (non-Xen parts 2.6.23-rc4-mm1) + +The kernel's ISA DMA API is just not fitting virtualization requirements. + +Index: head-2007-09-03/arch/i386/kernel/setup-xen.c +=================================================================== +--- head-2007-09-03.orig/arch/i386/kernel/setup-xen.c 2007-09-03 09:53:47.000000000 +0200 ++++ head-2007-09-03/arch/i386/kernel/setup-xen.c 2007-09-03 10:02:35.000000000 +0200 +@@ -758,6 +758,11 @@ void __init setup_arch(char **cmdline_p) + virt_to_mfn(pfn_to_mfn_frame_list_list); + } + ++ /* Mark all ISA DMA channels in-use - using them wouldn't work. */ ++ for (i = 0; i < MAX_DMA_CHANNELS; ++i) ++ if (i != 4 && request_dma(i, "xen") != 0) ++ BUG(); ++ + /* + * NOTE: at this point the bootmem allocator is fully available. + */ +Index: head-2007-09-03/arch/x86_64/kernel/Makefile +=================================================================== +--- head-2007-09-03.orig/arch/x86_64/kernel/Makefile 2007-09-03 10:01:35.000000000 +0200 ++++ head-2007-09-03/arch/x86_64/kernel/Makefile 2007-09-03 10:03:00.000000000 +0200 +@@ -69,7 +69,7 @@ pci-dma-y += ../../i386/kernel/pci-dma + microcode-$(subst m,y,$(CONFIG_MICROCODE)) := ../../i386/kernel/microcode-xen.o + quirks-y := ../../i386/kernel/quirks-xen.o + +-n-obj-xen := early-quirks.o genapic_flat.o i8237.o i8259.o perfctr-watchdog.o \ ++n-obj-xen := early-quirks.o genapic_flat.o i8259.o perfctr-watchdog.o \ + reboot.o smpboot.o trampoline.o tsc.o tsc_sync.o + + include $(srctree)/scripts/Makefile.xen +Index: head-2007-09-03/arch/x86_64/kernel/setup-xen.c +=================================================================== +--- head-2007-09-03.orig/arch/x86_64/kernel/setup-xen.c 2007-09-03 09:53:50.000000000 +0200 ++++ head-2007-09-03/arch/x86_64/kernel/setup-xen.c 2007-09-03 10:02:35.000000000 +0200 +@@ -534,6 +534,10 @@ void __init setup_arch(char **cmdline_p) + virt_to_mfn(pfn_to_mfn_frame_list_list); + } + ++ /* Mark all ISA DMA channels in-use - using them wouldn't work. */ ++ for (i = 0; i < MAX_DMA_CHANNELS; ++i) ++ if (i != 4 && request_dma(i, "xen") != 0) ++ BUG(); + } + + #ifdef CONFIG_ACPI +Index: head-2007-09-03/drivers/block/floppy.c +=================================================================== +--- head-2007-09-03.orig/drivers/block/floppy.c 2007-07-09 01:32:17.000000000 +0200 ++++ head-2007-09-03/drivers/block/floppy.c 2007-09-03 10:02:35.000000000 +0200 +@@ -4397,11 +4397,15 @@ static int floppy_grab_irq_and_dma(void) + if (fd_request_dma()) { + DPRINT("Unable to grab DMA%d for the floppy driver\n", + FLOPPY_DMA); +- fd_free_irq(); +- spin_lock_irqsave(&floppy_usage_lock, flags); +- usage_count--; +- spin_unlock_irqrestore(&floppy_usage_lock, flags); +- return -1; ++ if (can_use_virtual_dma & 2) ++ use_virtual_dma = can_use_virtual_dma = 1; ++ if (!(can_use_virtual_dma & 1)) { ++ fd_free_irq(); ++ spin_lock_irqsave(&floppy_usage_lock, flags); ++ usage_count--; ++ spin_unlock_irqrestore(&floppy_usage_lock, flags); ++ return -1; ++ } + } + + for (fdc = 0; fdc < N_FDC; fdc++) { +Index: head-2007-09-03/drivers/pnp/manager.c +=================================================================== +--- head-2007-09-03.orig/drivers/pnp/manager.c 2007-04-26 05:08:32.000000000 +0200 ++++ head-2007-09-03/drivers/pnp/manager.c 2007-09-03 10:02:35.000000000 +0200 +@@ -168,7 +168,7 @@ static int pnp_assign_irq(struct pnp_dev + return 0; + } + +-static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx) ++static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx) + { + resource_size_t *start, *end; + unsigned long *flags; +@@ -179,18 +179,14 @@ static int pnp_assign_dma(struct pnp_dev + 1, 3, 5, 6, 7, 0, 2, 4 + }; + +- if (!dev || !rule) +- return -EINVAL; +- + if (idx >= PNP_MAX_DMA) { + pnp_err("More than 2 dmas is incompatible with pnp specifications."); +- /* pretend we were successful so at least the manager won't try again */ +- return 1; ++ return; + } + + /* check if this resource has been manually set, if so skip */ + if (!(dev->res.dma_resource[idx].flags & IORESOURCE_AUTO)) +- return 1; ++ return; + + start = &dev->res.dma_resource[idx].start; + end = &dev->res.dma_resource[idx].end; +@@ -200,19 +196,17 @@ static int pnp_assign_dma(struct pnp_dev + *flags |= rule->flags | IORESOURCE_DMA; + *flags &= ~IORESOURCE_UNSET; + +- if (!rule->map) { +- *flags |= IORESOURCE_DISABLED; +- return 1; /* skip disabled resource requests */ +- } +- + for (i = 0; i < 8; i++) { + if(rule->map & (1<<xtab[i])) { + *start = *end = xtab[i]; + if(pnp_check_dma(dev, idx)) +- return 1; ++ return; + } + } +- return 0; ++#ifdef MAX_DMA_CHANNELS ++ *start = *end = MAX_DMA_CHANNELS; ++#endif ++ *flags |= IORESOURCE_UNSET | IORESOURCE_DISABLED; + } + + /** +@@ -331,8 +325,7 @@ static int pnp_assign_resources(struct p + irq = irq->next; + } + while (dma) { +- if (!pnp_assign_dma(dev, dma, ndma)) +- goto fail; ++ pnp_assign_dma(dev, dma, ndma); + ndma++; + dma = dma->next; + } +@@ -367,8 +360,7 @@ static int pnp_assign_resources(struct p + irq = irq->next; + } + while (dma) { +- if (!pnp_assign_dma(dev, dma, ndma)) +- goto fail; ++ pnp_assign_dma(dev, dma, ndma); + ndma++; + dma = dma->next; + } +Index: head-2007-09-03/include/asm-i386/mach-xen/asm/floppy.h +=================================================================== +--- head-2007-09-03.orig/include/asm-i386/mach-xen/asm/floppy.h 2007-09-03 09:53:00.000000000 +0200 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,147 +0,0 @@ +-/* +- * Architecture specific parts of the Floppy driver +- * +- * This file is subject to the terms and conditions of the GNU General Public +- * License. See the file "COPYING" in the main directory of this archive +- * for more details. +- * +- * Copyright (C) 1995 +- * +- * Modifications for Xen are Copyright (c) 2004, Keir Fraser. +- */ +-#ifndef __ASM_XEN_I386_FLOPPY_H +-#define __ASM_XEN_I386_FLOPPY_H +- +-#include <linux/vmalloc.h> +- +-/* XEN: Hit DMA paths on the head. This trick from asm-m68k/floppy.h. */ +-#include <asm/dma.h> +-#undef MAX_DMA_ADDRESS +-#define MAX_DMA_ADDRESS 0 +-#define CROSS_64KB(a,s) (0) +- +-#define fd_inb(port) inb_p(port) +-#define fd_outb(value,port) outb_p(value,port) +- +-#define fd_request_dma() (0) +-#define fd_free_dma() ((void)0) +-#define fd_enable_irq() enable_irq(FLOPPY_IRQ) +-#define fd_disable_irq() disable_irq(FLOPPY_IRQ) +-#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL) +-#define fd_get_dma_residue() (virtual_dma_count + virtual_dma_residue) +-#define fd_dma_setup(addr, size, mode, io) vdma_dma_setup(addr, size, mode, io) +-/* +- * Do not use vmalloc/vfree: floppy_release_irq_and_dma() gets called from +- * softirq context via motor_off_callback. A generic bug we happen to trigger. +- */ +-#define fd_dma_mem_alloc(size) __get_free_pages(GFP_KERNEL, get_order(size)) +-#define fd_dma_mem_free(addr, size) free_pages(addr, get_order(size)) +- +-static int virtual_dma_count; +-static int virtual_dma_residue; +-static char *virtual_dma_addr; +-static int virtual_dma_mode; +-static int doing_pdma; +- +-static irqreturn_t floppy_hardint(int irq, void *dev_id) +-{ +- register unsigned char st; +- register int lcount; +- register char *lptr; +- +- if (!doing_pdma) +- return floppy_interrupt(irq, dev_id); +- +- st = 1; +- for(lcount=virtual_dma_count, lptr=virtual_dma_addr; +- lcount; lcount--, lptr++) { +- st=inb(virtual_dma_port+4) & 0xa0 ; +- if(st != 0xa0) +- break; +- if(virtual_dma_mode) +- outb_p(*lptr, virtual_dma_port+5); +- else +- *lptr = inb_p(virtual_dma_port+5); +- } +- virtual_dma_count = lcount; +- virtual_dma_addr = lptr; +- st = inb(virtual_dma_port+4); +- +- if(st == 0x20) +- return IRQ_HANDLED; +- if(!(st & 0x20)) { +- virtual_dma_residue += virtual_dma_count; +- virtual_dma_count=0; +- doing_pdma = 0; +- floppy_interrupt(irq, dev_id); +- return IRQ_HANDLED; +- } +- return IRQ_HANDLED; +-} +- +-static void fd_disable_dma(void) +-{ +- doing_pdma = 0; +- virtual_dma_residue += virtual_dma_count; +- virtual_dma_count=0; +-} +- +-static int fd_request_irq(void) +-{ +- return request_irq(FLOPPY_IRQ, floppy_hardint, +- IRQF_DISABLED, "floppy", NULL); +-} +- +-static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io) +-{ +- doing_pdma = 1; +- virtual_dma_port = io; +- virtual_dma_mode = (mode == DMA_MODE_WRITE); +- virtual_dma_addr = addr; +- virtual_dma_count = size; +- virtual_dma_residue = 0; +- return 0; +-} +- +-/* XEN: This trick to force 'virtual DMA' is from include/asm-m68k/floppy.h. */ +-#define FDC1 xen_floppy_init() +-static int FDC2 = -1; +- +-static int xen_floppy_init(void) +-{ +- use_virtual_dma = 1; +- can_use_virtual_dma = 1; +- return 0x3f0; +-} +- +-/* +- * Floppy types are stored in the rtc's CMOS RAM and so rtc_lock +- * is needed to prevent corrupted CMOS RAM in case "insmod floppy" +- * coincides with another rtc CMOS user. Paul G. +- */ +-#define FLOPPY0_TYPE ({ \ +- unsigned long flags; \ +- unsigned char val; \ +- spin_lock_irqsave(&rtc_lock, flags); \ +- val = (CMOS_READ(0x10) >> 4) & 15; \ +- spin_unlock_irqrestore(&rtc_lock, flags); \ +- val; \ +-}) +- +-#define FLOPPY1_TYPE ({ \ +- unsigned long flags; \ +- unsigned char val; \ +- spin_lock_irqsave(&rtc_lock, flags); \ +- val = CMOS_READ(0x10) & 15; \ +- spin_unlock_irqrestore(&rtc_lock, flags); \ +- val; \ +-}) +- +-#define N_FDC 2 +-#define N_DRIVE 8 +- +-#define FLOPPY_MOTOR_MASK 0xf0 +- +-#define EXTRA_FLOPPY_PARAMS +- +-#endif /* __ASM_XEN_I386_FLOPPY_H */ +Index: head-2007-09-03/include/asm-i386/mach-xen/asm/io.h +=================================================================== +--- head-2007-09-03.orig/include/asm-i386/mach-xen/asm/io.h 2007-09-03 09:53:30.000000000 +0200 ++++ head-2007-09-03/include/asm-i386/mach-xen/asm/io.h 2007-09-03 10:02:35.000000000 +0200 +@@ -152,7 +152,7 @@ extern void bt_iounmap(void *addr, unsig + /* + * ISA I/O bus memory addresses are 1:1 with the physical address. + */ +-#define isa_virt_to_bus(_x) isa_virt_to_bus_is_UNSUPPORTED->x ++#define isa_virt_to_bus(_x) ({ BUG(); virt_to_bus(_x); }) + #define isa_page_to_bus(_x) isa_page_to_bus_is_UNSUPPORTED->x + #define isa_bus_to_virt(_x) (void *)(__fix_to_virt(FIX_ISAMAP_BEGIN) + (_x)) + +Index: head-2007-09-03/include/asm-x86_64/mach-xen/asm/floppy.h +=================================================================== +--- head-2007-09-03.orig/include/asm-x86_64/mach-xen/asm/floppy.h 2007-09-03 09:53:00.000000000 +0200 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,206 +0,0 @@ +-/* +- * Architecture specific parts of the Floppy driver +- * +- * This file is subject to the terms and conditions of the GNU General Public +- * License. See the file "COPYING" in the main directory of this archive +- * for more details. +- * +- * Copyright (C) 1995 +- * +- * Modifications for Xen are Copyright (c) 2004, Keir Fraser. +- */ +-#ifndef __ASM_XEN_X86_64_FLOPPY_H +-#define __ASM_XEN_X86_64_FLOPPY_H +- +-#include <linux/vmalloc.h> +- +-/* +- * The DMA channel used by the floppy controller cannot access data at +- * addresses >= 16MB +- * +- * Went back to the 1MB limit, as some people had problems with the floppy +- * driver otherwise. It doesn't matter much for performance anyway, as most +- * floppy accesses go through the track buffer. +- */ +-#define _CROSS_64KB(a,s,vdma) \ +-(!(vdma) && ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64)) +- +-/* XEN: Hit DMA paths on the head. This trick from asm-m68k/floppy.h. */ +-#include <asm/dma.h> +-#undef MAX_DMA_ADDRESS +-#define MAX_DMA_ADDRESS 0 +-#define CROSS_64KB(a,s) (0) +- +-#define fd_inb(port) inb_p(port) +-#define fd_outb(value,port) outb_p(value,port) +- +-#define fd_request_dma() (0) +-#define fd_free_dma() ((void)0) +-#define fd_enable_irq() enable_irq(FLOPPY_IRQ) +-#define fd_disable_irq() disable_irq(FLOPPY_IRQ) +-#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL) +-#define fd_get_dma_residue() vdma_get_dma_residue(FLOPPY_DMA) +-/* +- * Do not use vmalloc/vfree: floppy_release_irq_and_dma() gets called from +- * softirq context via motor_off_callback. A generic bug we happen to trigger. +- */ +-#define fd_dma_mem_alloc(size) __get_free_pages(GFP_KERNEL|__GFP_NORETRY, get_order(size)) +-#define fd_dma_mem_free(addr, size) free_pages(addr, get_order(size)) +-#define fd_dma_setup(addr, size, mode, io) vdma_dma_setup(addr, size, mode, io) +- +-static int virtual_dma_count; +-static int virtual_dma_residue; +-static char *virtual_dma_addr; +-static int virtual_dma_mode; +-static int doing_pdma; +- +-static irqreturn_t floppy_hardint(int irq, void *dev_id) +-{ +- register unsigned char st; +- +-#undef TRACE_FLPY_INT +- +-#ifdef TRACE_FLPY_INT +- static int calls=0; +- static int bytes=0; +- static int dma_wait=0; +-#endif +- if (!doing_pdma) +- return floppy_interrupt(irq, dev_id); +- +-#ifdef TRACE_FLPY_INT +- if(!calls) +- bytes = virtual_dma_count; +-#endif +- +- { +- register int lcount; +- register char *lptr; +- +- st = 1; +- for(lcount=virtual_dma_count, lptr=virtual_dma_addr; +- lcount; lcount--, lptr++) { +- st=inb(virtual_dma_port+4) & 0xa0 ; +- if(st != 0xa0) +- break; +- if(virtual_dma_mode) +- outb_p(*lptr, virtual_dma_port+5); +- else +- *lptr = inb_p(virtual_dma_port+5); +- } +- virtual_dma_count = lcount; +- virtual_dma_addr = lptr; +- st = inb(virtual_dma_port+4); +- } +- +-#ifdef TRACE_FLPY_INT +- calls++; +-#endif +- if(st == 0x20) +- return IRQ_HANDLED; +- if(!(st & 0x20)) { +- virtual_dma_residue += virtual_dma_count; +- virtual_dma_count=0; +-#ifdef TRACE_FLPY_INT +- printk("count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n", +- virtual_dma_count, virtual_dma_residue, calls, bytes, +- dma_wait); +- calls = 0; +- dma_wait=0; +-#endif +- doing_pdma = 0; +- floppy_interrupt(irq, dev_id); +- return IRQ_HANDLED; +- } +-#ifdef TRACE_FLPY_INT +- if(!virtual_dma_count) +- dma_wait++; +-#endif +- return IRQ_HANDLED; +-} +- +-static void fd_disable_dma(void) +-{ +- doing_pdma = 0; +- virtual_dma_residue += virtual_dma_count; +- virtual_dma_count=0; +-} +- +-static int vdma_get_dma_residue(unsigned int dummy) +-{ +- return virtual_dma_count + virtual_dma_residue; +-} +- +- +-static int fd_request_irq(void) +-{ +- return request_irq(FLOPPY_IRQ, floppy_hardint, +- IRQF_DISABLED, "floppy", NULL); +-} +- +-#if 0 +-static unsigned long vdma_mem_alloc(unsigned long size) +-{ +- return (unsigned long) vmalloc(size); +- +-} +- +-static void vdma_mem_free(unsigned long addr, unsigned long size) +-{ +- vfree((void *)addr); +-} +-#endif +- +-static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io) +-{ +- doing_pdma = 1; +- virtual_dma_port = io; +- virtual_dma_mode = (mode == DMA_MODE_WRITE); +- virtual_dma_addr = addr; +- virtual_dma_count = size; +- virtual_dma_residue = 0; +- return 0; +-} +- +-/* XEN: This trick to force 'virtual DMA' is from include/asm-m68k/floppy.h. */ +-#define FDC1 xen_floppy_init() +-static int FDC2 = -1; +- +-static int xen_floppy_init(void) +-{ +- use_virtual_dma = 1; +- can_use_virtual_dma = 1; +- return 0x3f0; +-} +- +-/* +- * Floppy types are stored in the rtc's CMOS RAM and so rtc_lock +- * is needed to prevent corrupted CMOS RAM in case "insmod floppy" +- * coincides with another rtc CMOS user. Paul G. +- */ +-#define FLOPPY0_TYPE ({ \ +- unsigned long flags; \ +- unsigned char val; \ +- spin_lock_irqsave(&rtc_lock, flags); \ +- val = (CMOS_READ(0x10) >> 4) & 15; \ +- spin_unlock_irqrestore(&rtc_lock, flags); \ +- val; \ +-}) +- +-#define FLOPPY1_TYPE ({ \ +- unsigned long flags; \ +- unsigned char val; \ +- spin_lock_irqsave(&rtc_lock, flags); \ +- val = CMOS_READ(0x10) & 15; \ +- spin_unlock_irqrestore(&rtc_lock, flags); \ +- val; \ +-}) +- +-#define N_FDC 2 +-#define N_DRIVE 8 +- +-#define FLOPPY_MOTOR_MASK 0xf0 +- +-#define EXTRA_FLOPPY_PARAMS +- +-#endif /* __ASM_XEN_X86_64_FLOPPY_H */ +Index: head-2007-09-03/include/asm-x86_64/mach-xen/asm/io.h +=================================================================== +--- head-2007-09-03.orig/include/asm-x86_64/mach-xen/asm/io.h 2007-09-03 09:53:19.000000000 +0200 ++++ head-2007-09-03/include/asm-x86_64/mach-xen/asm/io.h 2007-09-03 10:02:35.000000000 +0200 +@@ -167,7 +167,7 @@ extern void iounmap(volatile void __iome + * ISA I/O bus memory addresses are 1:1 with the physical address. + */ + +-#define isa_virt_to_bus(_x) isa_virt_to_bus_is_UNSUPPORTED->x ++#define isa_virt_to_bus(_x) ({ BUG(); virt_to_bus(_x); }) + #define isa_page_to_bus(_x) isa_page_to_bus_is_UNSUPPORTED->x + #define isa_bus_to_virt(_x) (void *)(__fix_to_virt(FIX_ISAMAP_BEGIN) + (_x)) + ++++++ post.sh ++++++ --- kernel-source/post.sh 2007-09-07 19:56:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/post.sh 2007-09-11 17:27:51.316906000 +0200 @@ -70,10 +70,12 @@ if [ -f /etc/fstab -a ! -e /.buildenv -a -x /sbin/mkinitrd ] && run_bootloader ; then - if ! /sbin/mkinitrd -k /boot/@IMAGE@-@KERNELRELEASE@ \ - -i /boot/initrd-@KERNELRELEASE@; then - echo "/sbin/mkinitrd failed" >&2 - exit 1 + if [ "$YAST_IS_RUNNING" != instsys ] ; then + if ! /sbin/mkinitrd -k /boot/@IMAGE@-@KERNELRELEASE@ \ + -i /boot/initrd-@KERNELRELEASE@; then + echo "/sbin/mkinitrd failed" >&2 + exit 1 + fi fi # handle 10.2 and SLES10 SP1 ++++++ series.conf ++++++ --- kernel-source/series.conf 2007-09-07 19:55:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2007-09-11 17:27:33.249992000 +0200 @@ -131,6 +131,7 @@ patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch patches.fixes/invalid-semicolon patches.arch/ppc-fix-prpmc2800 + patches.arch/ppc-prom-nodisplay.patch ######################################################## # powerpc/playstation3 @@ -690,6 +691,7 @@ patches.apparmor/apparmor-intree.diff patches.apparmor/apparmor-network.diff patches.apparmor/apparmor-stack_secondary.diff + patches.apparmor/apparmor-log-audit-type.diff patches.apparmor/do_path_lookup-nameidata.diff patches.apparmor/sys_fchdir-nameidata.diff patches.apparmor/file_permission-nameidata.diff @@ -829,6 +831,7 @@ -RT patches.xen/xen-x86_64-entry -RT patches.xen/xen-intel-agp -RT patches.xen/xen-blkback-cdrom +-RT patches.xen/xen-isa-dma # RT +RT patches.rt/patch-2.6.22.1-rt4.openSUSE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de