Hello community,
here is the log from the commit of package kernel-source
checked in at Mon Aug 21 11:35:52 CEST 2006.
--------
--- kernel-source/kernel-bigsmp.changes 2006-08-16 14:16:10.000000000 +0200
+++ kernel-source/kernel-bigsmp.changes 2006-08-18 17:24:30.000000000 +0200
@@ -1,0 +2,19 @@
+Fri Aug 18 16:55:47 CEST 2006 - trenn@suse.de
+
+- patches.fixes/workqueue-remove-lock_cpu_hotplug.patch: Fix
+ hotplug/ondemand locking issue (200194).
+
+-------------------------------------------------------------------
+Thu Aug 17 18:08:02 CEST 2006 - olh@suse.de
+
+- update patches.suse/suse-ppc32-mol-kbuild.patch
+ allow mol module on smp kernels (198216)
+
+-------------------------------------------------------------------
+Thu Aug 17 17:42:18 CEST 2006 - kraxel@suse.de
+
+- patches.uml/uml-kconfig: kconfig: enable vt & input subsystems
+ for UML (new).
+- patches.uml/uml-x11-fb: uml: x11 framebuffer driver (updated).
+
+-------------------------------------------------------------------
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-iseries64.changes: same change
kernel-kdump.changes: same change
kernel-ppc64.changes: same change
kernel-s390.changes: same change
kernel-smp.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-um.changes: same change
kernel-xen.changes: same change
kernel-xenpae.changes: same change
New:
----
needed_space_in_mb
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-bigsmp.spec ++++++
--- /var/tmp/diff_new_pack.R5OsIg/_old 2006-08-21 11:32:58.000000000 +0200
+++ /var/tmp/diff_new_pack.R5OsIg/_new 2006-08-21 11:32:58.000000000 +0200
@@ -21,7 +21,7 @@
BuildRequires: python
%endif
Version: 2.6.18_rc4
-Release: 3
+Release: 4
Summary: Kernel with Multiprocessor Support and PAE
License: GPL
Group: System/Kernel
@@ -119,7 +119,7 @@
-Source Timestamp: 2006/08/16 11:40:26 UTC
+Source Timestamp: 2006/08/18 14:56:08 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
@@ -463,6 +463,16 @@
%files -f kernel.files
%changelog -n kernel-bigsmp
+* Fri Aug 18 2006 - trenn@suse.de
+- patches.fixes/workqueue-remove-lock_cpu_hotplug.patch: Fix
+ hotplug/ondemand locking issue (200194).
+* Thu Aug 17 2006 - olh@suse.de
+- update patches.suse/suse-ppc32-mol-kbuild.patch
+ allow mol module on smp kernels (198216)
+* Thu Aug 17 2006 - kraxel@suse.de
+- patches.uml/uml-kconfig: kconfig: enable vt & input subsystems
+ for UML (new).
+- patches.uml/uml-x11-fb: uml: x11 framebuffer driver (updated).
* Wed Aug 16 2006 - schwab@suse.de
- x86_64/debug: Disable kdb.
* Wed Aug 16 2006 - kraxel@suse.de
kernel-debug.spec: same change
kernel-default.spec: same change
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.R5OsIg/_old 2006-08-21 11:32:58.000000000 +0200
+++ /var/tmp/diff_new_pack.R5OsIg/_new 2006-08-21 11:32:58.000000000 +0200
@@ -17,7 +17,7 @@
Summary: Internal dummy package for synchronizing release numbers
Group: System/Kernel
Version: 2.6.18_rc4
-Release: 3
+Release: 4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -27,7 +27,7 @@
--------
Andreas Gruenbacher
-Source Timestamp: 2006/08/16 11:40:26 UTC
+Source Timestamp: 2006/08/18 14:56:08 UTC
%install
@@ -40,6 +40,16 @@
/etc/dummy
%changelog -n kernel-dummy
+* Fri Aug 18 2006 - trenn@suse.de
+- patches.fixes/workqueue-remove-lock_cpu_hotplug.patch: Fix
+ hotplug/ondemand locking issue (200194).
+* Thu Aug 17 2006 - olh@suse.de
+- update patches.suse/suse-ppc32-mol-kbuild.patch
+ allow mol module on smp kernels (198216)
+* Thu Aug 17 2006 - kraxel@suse.de
+- patches.uml/uml-kconfig: kconfig: enable vt & input subsystems
+ for UML (new).
+- patches.uml/uml-x11-fb: uml: x11 framebuffer driver (updated).
* Wed Aug 16 2006 - schwab@suse.de
- x86_64/debug: Disable kdb.
* Wed Aug 16 2006 - kraxel@suse.de
++++++ kernel-iseries64.spec ++++++
--- /var/tmp/diff_new_pack.R5OsIg/_old 2006-08-21 11:32:59.000000000 +0200
+++ /var/tmp/diff_new_pack.R5OsIg/_new 2006-08-21 11:32:59.000000000 +0200
@@ -21,7 +21,7 @@
BuildRequires: python
%endif
Version: 2.6.18_rc4
-Release: 3
+Release: 4
Summary: 64-Bit Kernel for iSeries
License: GPL
Group: System/Kernel
@@ -120,7 +120,7 @@
-Source Timestamp: 2006/08/16 11:40:26 UTC
+Source Timestamp: 2006/08/18 14:56:08 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
@@ -464,6 +464,16 @@
%files -f kernel.files
%changelog -n kernel-iseries64
+* Fri Aug 18 2006 - trenn@suse.de
+- patches.fixes/workqueue-remove-lock_cpu_hotplug.patch: Fix
+ hotplug/ondemand locking issue (200194).
+* Thu Aug 17 2006 - olh@suse.de
+- update patches.suse/suse-ppc32-mol-kbuild.patch
+ allow mol module on smp kernels (198216)
+* Thu Aug 17 2006 - kraxel@suse.de
+- patches.uml/uml-kconfig: kconfig: enable vt & input subsystems
+ for UML (new).
+- patches.uml/uml-x11-fb: uml: x11 framebuffer driver (updated).
* Wed Aug 16 2006 - schwab@suse.de
- x86_64/debug: Disable kdb.
* Wed Aug 16 2006 - kraxel@suse.de
kernel-kdump.spec: same change
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.R5OsIg/_old 2006-08-21 11:32:59.000000000 +0200
+++ /var/tmp/diff_new_pack.R5OsIg/_new 2006-08-21 11:32:59.000000000 +0200
@@ -20,7 +20,7 @@
BuildRequires: python
%endif
Version: 2.6.18_rc4
-Release: 3
+Release: 4
Summary: Kernel for ppc64 Systems
License: GPL, LGPL
Group: System/Kernel
@@ -134,7 +134,7 @@
Tom Gall
see /usr/src/linux-pmac-benh/CREDITS for more details.
-Source Timestamp: 2006/08/16 11:40:26 UTC
+Source Timestamp: 2006/08/18 14:56:08 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
@@ -478,6 +478,16 @@
%files -f kernel.files
%changelog -n kernel-ppc64
+* Fri Aug 18 2006 - trenn@suse.de
+- patches.fixes/workqueue-remove-lock_cpu_hotplug.patch: Fix
+ hotplug/ondemand locking issue (200194).
+* Thu Aug 17 2006 - olh@suse.de
+- update patches.suse/suse-ppc32-mol-kbuild.patch
+ allow mol module on smp kernels (198216)
+* Thu Aug 17 2006 - kraxel@suse.de
+- patches.uml/uml-kconfig: kconfig: enable vt & input subsystems
+ for UML (new).
+- patches.uml/uml-x11-fb: uml: x11 framebuffer driver (updated).
* Wed Aug 16 2006 - schwab@suse.de
- x86_64/debug: Disable kdb.
* Wed Aug 16 2006 - kraxel@suse.de
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.R5OsIg/_old 2006-08-21 11:32:59.000000000 +0200
+++ /var/tmp/diff_new_pack.R5OsIg/_new 2006-08-21 11:32:59.000000000 +0200
@@ -21,7 +21,7 @@
BuildRequires: python
%endif
Version: 2.6.18_rc4
-Release: 3
+Release: 4
Summary: The Standard Kernel
License: GPL
Group: System/Kernel
@@ -117,7 +117,7 @@
-Source Timestamp: 2006/08/16 11:40:26 UTC
+Source Timestamp: 2006/08/18 14:56:08 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
@@ -461,6 +461,16 @@
%files -f kernel.files
%changelog -n kernel-s390
+* Fri Aug 18 2006 - trenn@suse.de
+- patches.fixes/workqueue-remove-lock_cpu_hotplug.patch: Fix
+ hotplug/ondemand locking issue (200194).
+* Thu Aug 17 2006 - olh@suse.de
+- update patches.suse/suse-ppc32-mol-kbuild.patch
+ allow mol module on smp kernels (198216)
+* Thu Aug 17 2006 - kraxel@suse.de
+- patches.uml/uml-kconfig: kconfig: enable vt & input subsystems
+ for UML (new).
+- patches.uml/uml-x11-fb: uml: x11 framebuffer driver (updated).
* Wed Aug 16 2006 - schwab@suse.de
- x86_64/debug: Disable kdb.
* Wed Aug 16 2006 - kraxel@suse.de
kernel-smp.spec: same change
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.R5OsIg/_old 2006-08-21 11:32:59.000000000 +0200
+++ /var/tmp/diff_new_pack.R5OsIg/_new 2006-08-21 11:32:59.000000000 +0200
@@ -25,7 +25,7 @@
%endif
PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status
Version: 2.6.18_rc4
-Release: 3
+Release: 4
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source2: source-post.sh
@@ -93,7 +93,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2006/08/16 11:40:26 UTC
+Source Timestamp: 2006/08/18 14:56:08 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
@@ -275,6 +275,16 @@
%files -f kernel-source.files
%changelog -n kernel-source
+* Fri Aug 18 2006 - trenn@suse.de
+- patches.fixes/workqueue-remove-lock_cpu_hotplug.patch: Fix
+ hotplug/ondemand locking issue (200194).
+* Thu Aug 17 2006 - olh@suse.de
+- update patches.suse/suse-ppc32-mol-kbuild.patch
+ allow mol module on smp kernels (198216)
+* Thu Aug 17 2006 - kraxel@suse.de
+- patches.uml/uml-kconfig: kconfig: enable vt & input subsystems
+ for UML (new).
+- patches.uml/uml-x11-fb: uml: x11 framebuffer driver (updated).
* Wed Aug 16 2006 - schwab@suse.de
- x86_64/debug: Disable kdb.
* Wed Aug 16 2006 - kraxel@suse.de
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.R5OsIg/_old 2006-08-21 11:32:59.000000000 +0200
+++ /var/tmp/diff_new_pack.R5OsIg/_new 2006-08-21 11:32:59.000000000 +0200
@@ -49,7 +49,7 @@
Summary: Kernel Symbol Versions (modversions)
Group: Development/Sources
Version: 2.6.18_rc4
-Release: 3
+Release: 4
Requires: linux
Requires: kernel-source = 2.6.18_rc4-%release
Source11: arch-symbols
@@ -84,7 +84,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2006/08/16 11:40:26 UTC
+Source Timestamp: 2006/08/18 14:56:08 UTC
%install
@@ -127,6 +127,16 @@
/boot/symsets-*-*.tar.gz
%changelog -n kernel-syms
+* Fri Aug 18 2006 - trenn@suse.de
+- patches.fixes/workqueue-remove-lock_cpu_hotplug.patch: Fix
+ hotplug/ondemand locking issue (200194).
+* Thu Aug 17 2006 - olh@suse.de
+- update patches.suse/suse-ppc32-mol-kbuild.patch
+ allow mol module on smp kernels (198216)
+* Thu Aug 17 2006 - kraxel@suse.de
+- patches.uml/uml-kconfig: kconfig: enable vt & input subsystems
+ for UML (new).
+- patches.uml/uml-x11-fb: uml: x11 framebuffer driver (updated).
* Wed Aug 16 2006 - schwab@suse.de
- x86_64/debug: Disable kdb.
* Wed Aug 16 2006 - kraxel@suse.de
++++++ kernel-um.spec ++++++
--- /var/tmp/diff_new_pack.R5OsIg/_old 2006-08-21 11:32:59.000000000 +0200
+++ /var/tmp/diff_new_pack.R5OsIg/_new 2006-08-21 11:32:59.000000000 +0200
@@ -21,7 +21,7 @@
BuildRequires: python
%endif
Version: 2.6.18_rc4
-Release: 3
+Release: 4
Summary: The User Mode Linux kernel.
License: GPL
Group: System/Kernel
@@ -125,7 +125,7 @@
-Source Timestamp: 2006/08/16 11:40:26 UTC
+Source Timestamp: 2006/08/18 14:56:08 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
@@ -469,6 +469,16 @@
%files -f kernel.files
%changelog -n kernel-um
+* Fri Aug 18 2006 - trenn@suse.de
+- patches.fixes/workqueue-remove-lock_cpu_hotplug.patch: Fix
+ hotplug/ondemand locking issue (200194).
+* Thu Aug 17 2006 - olh@suse.de
+- update patches.suse/suse-ppc32-mol-kbuild.patch
+ allow mol module on smp kernels (198216)
+* Thu Aug 17 2006 - kraxel@suse.de
+- patches.uml/uml-kconfig: kconfig: enable vt & input subsystems
+ for UML (new).
+- patches.uml/uml-x11-fb: uml: x11 framebuffer driver (updated).
* Wed Aug 16 2006 - schwab@suse.de
- x86_64/debug: Disable kdb.
* Wed Aug 16 2006 - kraxel@suse.de
kernel-xen.spec: same change
kernel-xenpae.spec: same change
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2006-08-16 14:16:07.000000000 +0200
+++ kernel-source/build-source-timestamp 2006-08-18 17:24:26.000000000 +0200
@@ -1 +1 @@
-2006/08/16 11:40:26 UTC
+2006/08/18 14:56:08 UTC
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/workqueue-remove-lock_cpu_hotplug.patch new/patches.fixes/workqueue-remove-lock_cpu_hotplug.patch
--- old/patches.fixes/workqueue-remove-lock_cpu_hotplug.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/workqueue-remove-lock_cpu_hotplug.patch 2006-08-18 16:56:08.000000000 +0200
@@ -0,0 +1,150 @@
+From: Thomas Renninger
+Subject: Fix hotplug/ondemand locking issue
+References: 200194
+Patch-mainline: yes
+
+Use a private lock instead. It protects all per-cpu data structures in
+workqueue.c, including the workqueues list.
+
+Fix a bug in schedule_on_each_cpu(): it was forgetting to lock down the
+per-cpu resources.
+
+Unfixed long-standing bug: if someone unplugs the CPU identified by
+`singlethread_cpu' the kernel will get very sick.
+
+Cc: Dave Jones
+Signed-off-by: Andrew Morton
+---
+
+ kernel/workqueue.c | 33 +++++++++++++++++++++------------
+ 1 file changed, 21 insertions(+), 12 deletions(-)
+
+diff -puN kernel/workqueue.c~workqueue-remove-lock_cpu_hotplug kernel/workqueue.c
+--- a/kernel/workqueue.c~workqueue-remove-lock_cpu_hotplug
++++ a/kernel/workqueue.c
+@@ -68,7 +68,7 @@ struct workqueue_struct {
+
+ /* All the per-cpu workqueues on the system, for hotplug cpu to add/remove
+ threads to each one as cpus come/go. */
+-static DEFINE_SPINLOCK(workqueue_lock);
++static DEFINE_MUTEX(workqueue_mutex);
+ static LIST_HEAD(workqueues);
+
+ static int singlethread_cpu;
+@@ -320,10 +320,10 @@ void fastcall flush_workqueue(struct wor
+ } else {
+ int cpu;
+
+- lock_cpu_hotplug();
++ mutex_lock(&workqueue_mutex);
+ for_each_online_cpu(cpu)
+ flush_cpu_workqueue(per_cpu_ptr(wq->cpu_wq, cpu));
+- unlock_cpu_hotplug();
++ mutex_unlock(&workqueue_mutex);
+ }
+ }
+ EXPORT_SYMBOL_GPL(flush_workqueue);
+@@ -371,8 +371,7 @@ struct workqueue_struct *__create_workqu
+ }
+
+ wq->name = name;
+- /* We don't need the distraction of CPUs appearing and vanishing. */
+- lock_cpu_hotplug();
++ mutex_lock(&workqueue_mutex);
+ if (singlethread) {
+ INIT_LIST_HEAD(&wq->list);
+ p = create_workqueue_thread(wq, singlethread_cpu);
+@@ -381,9 +380,7 @@ struct workqueue_struct *__create_workqu
+ else
+ wake_up_process(p);
+ } else {
+- spin_lock(&workqueue_lock);
+ list_add(&wq->list, &workqueues);
+- spin_unlock(&workqueue_lock);
+ for_each_online_cpu(cpu) {
+ p = create_workqueue_thread(wq, cpu);
+ if (p) {
+@@ -393,7 +390,7 @@ struct workqueue_struct *__create_workqu
+ destroy = 1;
+ }
+ }
+- unlock_cpu_hotplug();
++ mutex_unlock(&workqueue_mutex);
+
+ /*
+ * Was there any error during startup? If yes then clean up:
+@@ -434,17 +431,15 @@ void destroy_workqueue(struct workqueue_
+ flush_workqueue(wq);
+
+ /* We don't need the distraction of CPUs appearing and vanishing. */
+- lock_cpu_hotplug();
++ mutex_lock(&workqueue_mutex);
+ if (is_single_threaded(wq))
+ cleanup_workqueue_thread(wq, singlethread_cpu);
+ else {
+ for_each_online_cpu(cpu)
+ cleanup_workqueue_thread(wq, cpu);
+- spin_lock(&workqueue_lock);
+ list_del(&wq->list);
+- spin_unlock(&workqueue_lock);
+ }
+- unlock_cpu_hotplug();
++ mutex_unlock(&workqueue_mutex);
+ free_percpu(wq->cpu_wq);
+ kfree(wq);
+ }
+@@ -515,11 +510,13 @@ int schedule_on_each_cpu(void (*func)(vo
+ if (!works)
+ return -ENOMEM;
+
++ mutex_lock(&workqueue_mutex);
+ for_each_online_cpu(cpu) {
+ INIT_WORK(per_cpu_ptr(works, cpu), func, info);
+ __queue_work(per_cpu_ptr(keventd_wq->cpu_wq, cpu),
+ per_cpu_ptr(works, cpu));
+ }
++ mutex_unlock(&workqueue_mutex);
+ flush_workqueue(keventd_wq);
+ free_percpu(works);
+ return 0;
+@@ -635,6 +632,7 @@ static int __devinit workqueue_cpu_callb
+
+ switch (action) {
+ case CPU_UP_PREPARE:
++ mutex_lock(&workqueue_mutex);
+ /* Create a new workqueue thread for it. */
+ list_for_each_entry(wq, &workqueues, list) {
+ if (!create_workqueue_thread(wq, hotcpu)) {
+@@ -653,6 +651,7 @@ static int __devinit workqueue_cpu_callb
+ kthread_bind(cwq->thread, hotcpu);
+ wake_up_process(cwq->thread);
+ }
++ mutex_unlock(&workqueue_mutex);
+ break;
+
+ case CPU_UP_CANCELED:
+@@ -664,6 +663,15 @@ static int __devinit workqueue_cpu_callb
+ any_online_cpu(cpu_online_map));
+ cleanup_workqueue_thread(wq, hotcpu);
+ }
++ mutex_unlock(&workqueue_mutex);
++ break;
++
++ case CPU_DOWN_PREPARE:
++ mutex_lock(&workqueue_mutex);
++ break;
++
++ case CPU_DOWN_FAILED:
++ mutex_unlock(&workqueue_mutex);
+ break;
+
+ case CPU_DEAD:
+@@ -671,6 +679,7 @@ static int __devinit workqueue_cpu_callb
+ cleanup_workqueue_thread(wq, hotcpu);
+ list_for_each_entry(wq, &workqueues, list)
+ take_over_work(wq, hotcpu);
++ mutex_unlock(&workqueue_mutex);
+ break;
+ }
+
+_
++++++ patches.suse.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/suse-ppc32-mol-kbuild.patch new/patches.suse/suse-ppc32-mol-kbuild.patch
--- old/patches.suse/suse-ppc32-mol-kbuild.patch 2006-08-01 09:27:16.000000000 +0200
+++ new/patches.suse/suse-ppc32-mol-kbuild.patch 2006-08-18 16:32:59.000000000 +0200
@@ -30,7 +30,7 @@
+config MACONLINUX
+ tristate "Mac on Linux kernel module"
-+ depends on PPC32 && PPC_PMAC && !SMP && MODULES && NET
++ depends on PPC32 && PPC_PMAC && MODULES && NET
+ help
+ call helpdesk
+
++++++ patches.uml.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.uml/uml-kconfig new/patches.uml/uml-kconfig
--- old/patches.uml/uml-kconfig 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.uml/uml-kconfig 2006-08-17 17:43:06.000000000 +0200
@@ -0,0 +1,279 @@
+Subject: kconfig: enable vt & input subsystems for UML
+From: kraxel@suse.de
+Patch-mainline: submitted 2006-08-17
+
+$subject says all
+
+Index: vanilla-2.6.18-rc4/drivers/input/keyboard/Kconfig
+===================================================================
+--- vanilla-2.6.18-rc4.orig/drivers/input/keyboard/Kconfig 2006-06-18 03:49:35.000000000 +0200
++++ vanilla-2.6.18-rc4/drivers/input/keyboard/Kconfig 2006-08-16 16:02:17.000000000 +0200
+@@ -10,7 +10,7 @@ menuconfig INPUT_KEYBOARD
+
+ If unsure, say Y.
+
+-if INPUT_KEYBOARD
++if INPUT_KEYBOARD && !UML
+
+ config KEYBOARD_ATKBD
+ tristate "AT keyboard" if EMBEDDED || !X86_PC
+Index: vanilla-2.6.18-rc4/drivers/input/mouse/Kconfig
+===================================================================
+--- vanilla-2.6.18-rc4.orig/drivers/input/mouse/Kconfig 2006-06-18 03:49:35.000000000 +0200
++++ vanilla-2.6.18-rc4/drivers/input/mouse/Kconfig 2006-08-16 16:02:17.000000000 +0200
+@@ -10,7 +10,7 @@ menuconfig INPUT_MOUSE
+
+ If unsure, say Y.
+
+-if INPUT_MOUSE
++if INPUT_MOUSE && !UML
+
+ config MOUSE_PS2
+ tristate "PS/2 mouse"
+Index: vanilla-2.6.18-rc4/drivers/input/serio/Kconfig
+===================================================================
+--- vanilla-2.6.18-rc4.orig/drivers/input/serio/Kconfig 2006-06-18 03:49:35.000000000 +0200
++++ vanilla-2.6.18-rc4/drivers/input/serio/Kconfig 2006-08-16 16:02:17.000000000 +0200
+@@ -21,7 +21,7 @@ if SERIO
+ config SERIO_I8042
+ tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
+ default y
+- depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K
++ depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !UML
+ ---help---
+ i8042 is the chip over which the standard AT keyboard and PS/2
+ mouse are connected to the computer. If you use these devices,
+Index: vanilla-2.6.18-rc4/drivers/char/Kconfig
+===================================================================
+--- vanilla-2.6.18-rc4.orig/drivers/char/Kconfig 2006-08-16 15:59:19.000000000 +0200
++++ vanilla-2.6.18-rc4/drivers/char/Kconfig 2006-08-16 16:02:17.000000000 +0200
+@@ -59,7 +59,7 @@ config VT_CONSOLE
+
+ config HW_CONSOLE
+ bool
+- depends on VT && !S390 && !UML
++ depends on VT && !S390
+ default y
+
+ config VT_HW_CONSOLE_BINDING
+@@ -81,6 +81,7 @@ config VT_HW_CONSOLE_BINDING
+
+ config SERIAL_NONSTANDARD
+ bool "Non-standard serial port support"
++ depends on !UML
+ ---help---
+ Say Y here if you have any non-standard serial boards -- boards
+ which aren't supported using the standard "dumb" serial driver.
+@@ -717,7 +718,7 @@ config NVRAM
+
+ config RTC
+ tristate "Enhanced Real Time Clock Support"
+- depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM
++ depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !UML
+ ---help---
+ If you say Y here and create a character special file /dev/rtc with
+ major number 10 and minor number 135 using mknod ("man mknod"), you
+@@ -765,7 +766,7 @@ config SGI_IP27_RTC
+
+ config GEN_RTC
+ tristate "Generic /dev/rtc emulation"
+- depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV
++ depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV && !UML
+ ---help---
+ If you say Y here and create a character special file /dev/rtc with
+ major number 10 and minor number 135 using mknod ("man mknod"), you
+@@ -818,6 +819,7 @@ config COBALT_LCD
+
+ config DTLK
+ tristate "Double Talk PC internal speech card support"
++ depends on ISA
+ help
+ This driver is for the DoubleTalk PC, a speech synthesizer
+ manufactured by RC Systems (http://www.rcsys.com/). It is also
+Index: vanilla-2.6.18-rc4/drivers/char/ipmi/Kconfig
+===================================================================
+--- vanilla-2.6.18-rc4.orig/drivers/char/ipmi/Kconfig 2006-06-18 03:49:35.000000000 +0200
++++ vanilla-2.6.18-rc4/drivers/char/ipmi/Kconfig 2006-08-16 16:02:17.000000000 +0200
+@@ -5,6 +5,7 @@
+ menu "IPMI"
+ config IPMI_HANDLER
+ tristate 'IPMI top-level message handler'
++ depends on !UML
+ help
+ This enables the central IPMI message handler, required for IPMI
+ to work.
+Index: vanilla-2.6.18-rc4/drivers/char/tpm/Kconfig
+===================================================================
+--- vanilla-2.6.18-rc4.orig/drivers/char/tpm/Kconfig 2006-06-18 03:49:35.000000000 +0200
++++ vanilla-2.6.18-rc4/drivers/char/tpm/Kconfig 2006-08-16 16:02:17.000000000 +0200
+@@ -6,7 +6,7 @@ menu "TPM devices"
+
+ config TCG_TPM
+ tristate "TPM Hardware Support"
+- depends on EXPERIMENTAL
++ depends on EXPERIMENTAL && !UML
+ ---help---
+ If you have a TPM security chip in your system, which
+ implements the Trusted Computing Group's specification,
+Index: vanilla-2.6.18-rc4/drivers/input/touchscreen/Kconfig
+===================================================================
+--- vanilla-2.6.18-rc4.orig/drivers/input/touchscreen/Kconfig 2006-06-18 03:49:35.000000000 +0200
++++ vanilla-2.6.18-rc4/drivers/input/touchscreen/Kconfig 2006-08-16 16:02:17.000000000 +0200
+@@ -9,7 +9,7 @@ menuconfig INPUT_TOUCHSCREEN
+
+ If unsure, say Y.
+
+-if INPUT_TOUCHSCREEN
++if INPUT_TOUCHSCREEN && !UML
+
+ config TOUCHSCREEN_ADS7846
+ tristate "ADS 7846 based touchscreens"
+Index: vanilla-2.6.18-rc4/drivers/serial/Kconfig
+===================================================================
+--- vanilla-2.6.18-rc4.orig/drivers/serial/Kconfig 2006-08-16 15:59:20.000000000 +0200
++++ vanilla-2.6.18-rc4/drivers/serial/Kconfig 2006-08-16 16:02:17.000000000 +0200
+@@ -11,6 +11,7 @@ menu "Serial drivers"
+ config SERIAL_8250
+ tristate "8250/16550 and compatible serial support"
+ depends on (BROKEN || !SPARC)
++ depends on !UML
+ select SERIAL_CORE
+ ---help---
+ This selects whether you want to include the driver for the standard
+Index: vanilla-2.6.18-rc4/drivers/video/Kconfig
+===================================================================
+--- vanilla-2.6.18-rc4.orig/drivers/video/Kconfig 2006-08-16 15:59:21.000000000 +0200
++++ vanilla-2.6.18-rc4/drivers/video/Kconfig 2006-08-16 16:02:17.000000000 +0200
+@@ -682,7 +682,7 @@ config FB_EPSON1355
+
+ config FB_S1D13XXX
+ tristate "Epson S1D13XXX framebuffer support"
+- depends on FB
++ depends on FB && !UML
+ select FB_CFB_FILLRECT
+ select FB_CFB_COPYAREA
+ select FB_CFB_IMAGEBLIT
+Index: vanilla-2.6.18-rc4/arch/um/Kconfig
+===================================================================
+--- vanilla-2.6.18-rc4.orig/arch/um/Kconfig 2006-06-18 03:49:35.000000000 +0200
++++ vanilla-2.6.18-rc4/arch/um/Kconfig 2006-08-16 16:10:02.000000000 +0200
+@@ -277,6 +277,12 @@ source "drivers/net/Kconfig"
+
+ source "drivers/connector/Kconfig"
+
++source "drivers/input/Kconfig"
++
++source "drivers/char/Kconfig"
++
++source "drivers/video/Kconfig"
++
+ source "fs/Kconfig"
+
+ source "security/Kconfig"
+Index: vanilla-2.6.18-rc4/arch/um/kernel/um_arch.c
+===================================================================
+--- vanilla-2.6.18-rc4.orig/arch/um/kernel/um_arch.c 2006-08-16 15:59:17.000000000 +0200
++++ vanilla-2.6.18-rc4/arch/um/kernel/um_arch.c 2006-08-16 16:02:17.000000000 +0200
+@@ -18,6 +18,7 @@
+ #include "linux/seq_file.h"
+ #include "linux/delay.h"
+ #include "linux/module.h"
++#include "linux/console.h"
+ #include "asm/page.h"
+ #include "asm/pgtable.h"
+ #include "asm/ptrace.h"
+@@ -486,6 +487,9 @@ void __init setup_arch(char **cmdline_p)
+ strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
+ *cmdline_p = command_line;
+ setup_hostinfo();
++#if defined(CONFIG_DUMMY_CONSOLE)
++ console_use_vt = 0;
++#endif
+ }
+
+ void __init check_bugs(void)
+Index: vanilla-2.6.18-rc4/drivers/char/tty_io.c
+===================================================================
+--- vanilla-2.6.18-rc4.orig/drivers/char/tty_io.c 2006-08-16 15:59:19.000000000 +0200
++++ vanilla-2.6.18-rc4/drivers/char/tty_io.c 2006-08-16 16:02:17.000000000 +0200
+@@ -130,6 +130,8 @@ LIST_HEAD(tty_drivers); /* linked list
+ vt.c for deeply disgusting hack reasons */
+ DEFINE_MUTEX(tty_mutex);
+
++int console_use_vt = 1;
++
+ #ifdef CONFIG_UNIX98_PTYS
+ extern struct tty_driver *ptm_driver; /* Unix98 pty masters; for /dev/ptmx */
+ extern int pty_limit; /* Config limit on Unix98 ptys */
+@@ -2048,7 +2050,7 @@ retry_open:
+ goto got_driver;
+ }
+ #ifdef CONFIG_VT
+- if (device == MKDEV(TTY_MAJOR,0)) {
++ if (console_use_vt && device == MKDEV(TTY_MAJOR,0)) {
+ extern struct tty_driver *console_driver;
+ driver = console_driver;
+ index = fg_console;
+@@ -3243,6 +3245,8 @@ static int __init tty_init(void)
+ #endif
+
+ #ifdef CONFIG_VT
++ if (!console_use_vt)
++ goto out_vt;
+ cdev_init(&vc0_cdev, &console_fops);
+ if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
+ register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
+@@ -3250,6 +3254,7 @@ static int __init tty_init(void)
+ class_device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
+
+ vty_init();
++ out_vt:
+ #endif
+ return 0;
+ }
+Index: vanilla-2.6.18-rc4/include/linux/console.h
+===================================================================
+--- vanilla-2.6.18-rc4.orig/include/linux/console.h 2006-08-16 15:59:21.000000000 +0200
++++ vanilla-2.6.18-rc4/include/linux/console.h 2006-08-16 16:02:17.000000000 +0200
+@@ -62,6 +62,7 @@ extern const struct consw dummy_con; /*
+ extern const struct consw vga_con; /* VGA text console */
+ extern const struct consw newport_con; /* SGI Newport console */
+ extern const struct consw prom_con; /* SPARC PROM console */
++extern int console_use_vt;
+
+ int con_is_bound(const struct consw *csw);
+ int register_con_driver(const struct consw *csw, int first, int last);
+Index: vanilla-2.6.18-rc4/drivers/video/console/Kconfig
+===================================================================
+--- vanilla-2.6.18-rc4.orig/drivers/video/console/Kconfig 2006-06-18 03:49:35.000000000 +0200
++++ vanilla-2.6.18-rc4/drivers/video/console/Kconfig 2006-08-16 16:02:17.000000000 +0200
+@@ -6,7 +6,7 @@ menu "Console display driver support"
+
+ config VGA_CONSOLE
+ bool "VGA text console" if EMBEDDED || !X86
+- depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE
++ depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !UML
+ default y
+ help
+ Saying Y here will allow you to use Linux in text mode through a
+Index: vanilla-2.6.18-rc4/drivers/video/fbmem.c
+===================================================================
+--- vanilla-2.6.18-rc4.orig/drivers/video/fbmem.c 2006-08-16 15:59:21.000000000 +0200
++++ vanilla-2.6.18-rc4/drivers/video/fbmem.c 2006-08-16 16:04:44.000000000 +0200
+@@ -1203,12 +1203,16 @@ fb_mmap(struct file *file, struct vm_are
+ vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
+ else
+ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
++#elif defined(CONFIG_UML)
++ /* nothing */
+ #else
+ #warning What do we have to do here??
+ #endif
++#ifndef CONFIG_UML
+ if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
+ vma->vm_end - vma->vm_start, vma->vm_page_prot))
+ return -EAGAIN;
++#endif
+ return 0;
+ #endif /* !sparc32 */
+ }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.uml/uml-x11-fb new/patches.uml/uml-x11-fb
--- old/patches.uml/uml-x11-fb 2006-08-01 09:27:16.000000000 +0200
+++ new/patches.uml/uml-x11-fb 2006-08-18 16:32:59.000000000 +0200
@@ -1,33 +1,18 @@
-Subject: [patch] uml: x11 fb
+Subject: uml: x11 framebuffer driver
From: kraxel@suse.de
+Patch-mainline: submitted 2006-08-17
Framebuffer driver for UML
Signed-off-by: Gerd Knorr
----
- arch/um/Kconfig | 10
- arch/um/Makefile | 12
- arch/um/drivers/Makefile | 2
- arch/um/drivers/x11_kern.c | 549 +++++++++++++++++++++++++++++++++++++++++++++
- arch/um/drivers/x11_user.c | 514 ++++++++++++++++++++++++++++++++++++++++++
- arch/um/include/x11_kern.h | 9
- arch/um/include/x11_user.h | 15 +
- arch/um/kernel/um_arch.c | 12
- drivers/char/Kconfig | 2
- drivers/video/fbmem.c | 4
- include/asm-um/irq.h | 3
- 11 files changed, 1126 insertions(+), 6 deletions(-)
-
---- linux-2.6.17.orig/arch/um/Kconfig
-+++ linux-2.6.17/arch/um/Kconfig
-@@ -106,6 +106,16 @@ config NET
+Index: vanilla-2.6.18-rc4/arch/um/Kconfig
+===================================================================
+--- vanilla-2.6.18-rc4.orig/arch/um/Kconfig 2006-08-17 10:43:08.000000000 +0200
++++ vanilla-2.6.18-rc4/arch/um/Kconfig 2006-08-17 10:45:27.000000000 +0200
+@@ -106,6 +106,12 @@ config NET
recommended to read the NET-HOWTO, available from
http://www.tldp.org/docs.html#howto.
-+source "drivers/input/Kconfig"
-+source "drivers/char/Kconfig"
-+source "drivers/video/Kconfig"
-+
+config X11_FB
+ bool "X11 Framebuffer driver"
+ depends on FB && !MODE_TT && !STATIC_LINK
@@ -37,8 +22,10 @@
source "fs/Kconfig.binfmt"
---- linux-2.6.17.orig/arch/um/drivers/Makefile
-+++ linux-2.6.17/arch/um/drivers/Makefile
+Index: vanilla-2.6.18-rc4/arch/um/drivers/Makefile
+===================================================================
+--- vanilla-2.6.18-rc4.orig/arch/um/drivers/Makefile 2006-06-18 03:49:35.000000000 +0200
++++ vanilla-2.6.18-rc4/arch/um/drivers/Makefile 2006-08-17 10:45:27.000000000 +0200
@@ -16,6 +16,7 @@ hostaudio-objs := hostaudio_kern.o
ubd-objs := ubd_kern.o ubd_user.o
port-objs := port_kern.o port_user.o
@@ -55,9 +42,11 @@
obj-$(CONFIG_XTERM_CHAN) += xterm.o xterm_kern.o
obj-$(CONFIG_UML_WATCHDOG) += harddog.o
obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o
---- /dev/null
-+++ linux-2.6.17/arch/um/drivers/x11_kern.c
-@@ -0,0 +1,549 @@
+Index: vanilla-2.6.18-rc4/arch/um/drivers/x11_kern.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vanilla-2.6.18-rc4/arch/um/drivers/x11_kern.c 2006-08-17 10:45:27.000000000 +0200
+@@ -0,0 +1,552 @@
+#include
+#include
+#include
@@ -365,18 +354,17 @@
+ struct vm_area_struct * vma)
+{
+ struct x11_kerndata *kd = p->par;
-+ struct x11_mapping *map;
++ struct x11_mapping *map = NULL;
+ int retval;
+ int map_pages;
+
+ down(&kd->mm_lock);
+
+ retval = -ENOMEM;
-+ if (NULL == (map = kmalloc(sizeof(*map), GFP_KERNEL))) {
++ if (NULL == (map = kzalloc(sizeof(*map), GFP_KERNEL))) {
+ printk("%s: oops, out of memory\n",__FUNCTION__);
+ goto out;
+ }
-+ memset(map,0,sizeof(*map));
+
+ retval = -EINVAL;
+ if (!(vma->vm_flags & VM_WRITE)) {
@@ -411,6 +399,8 @@
+ retval = 0;
+
+out:
++ if (map)
++ kfree(map);
+ up(&kd->mm_lock);
+ return retval;
+}
@@ -487,11 +477,6 @@
+ kd->info->flags = FBINFO_FLAG_DEFAULT;
+
+ fb_alloc_cmap(&kd->info->cmap, 256, 0);
-+ register_framebuffer(kd->info);
-+ printk(KERN_INFO "fb%d: %s frame buffer device, %dx%d, %d fps, %d bpp (%d:%d:%d)\n",
-+ kd->info->node, kd->info->fix.id,
-+ kd->var->xres, kd->var->yres, x11_fps, kd->var->bits_per_pixel,
-+ kd->var->red.length, kd->var->green.length, kd->var->blue.length);
+
+ /* keyboard setup */
+ set_bit(EV_KEY, kd->kbd->evbit);
@@ -501,7 +486,6 @@
+ kd->kbd->name = DRIVER_NAME " virtual keyboard";
+ kd->kbd->phys = DRIVER_NAME "/input0";
+ kd->kbd->cdev.dev = device;
-+ input_register_device(kd->kbd);
+
+ /* mouse setup */
+ init_input_dev(kd->mouse);
@@ -521,7 +505,6 @@
+ kd->mouse->name = DRIVER_NAME " virtual mouse";
+ kd->mouse->phys = DRIVER_NAME "/input1";
+ kd->mouse->cdev.dev = device;
-+ input_register_device(kd->mouse);
+
+ /* misc common kernel stuff */
+ init_MUTEX(&kd->mm_lock);
@@ -535,6 +518,15 @@
+ um_request_irq(X11_IRQ, x11_get_fd(kd->win), IRQ_READ, x11_irq,
+ SA_INTERRUPT | SA_SHIRQ, DRIVER_NAME, kd);
+
++ /* register devices */
++ register_framebuffer(kd->info);
++ input_register_device(kd->kbd);
++ input_register_device(kd->mouse);
++ printk(KERN_INFO "fb%d: %s frame buffer device, %dx%d, %d fps, %d bpp (%d:%d:%d)\n",
++ kd->info->node, kd->info->fix.id,
++ kd->var->xres, kd->var->yres, x11_fps, kd->var->bits_per_pixel,
++ kd->var->red.length, kd->var->green.length, kd->var->blue.length);
++
+ return 0;
+
+fail_vfree:
@@ -607,9 +599,11 @@
+ * c-basic-offset: 8
+ * End:
+ */
---- /dev/null
-+++ linux-2.6.17/arch/um/drivers/x11_user.c
-@@ -0,0 +1,514 @@
+Index: vanilla-2.6.18-rc4/arch/um/drivers/x11_user.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vanilla-2.6.18-rc4/arch/um/drivers/x11_user.c 2006-08-17 11:09:50.000000000 +0200
+@@ -0,0 +1,515 @@
+#include
+#include
+
@@ -894,6 +888,7 @@
+ win = malloc(sizeof(*win));
+ if (NULL == win)
+ goto fail;
++ memset(win,0,sizeof(*win));
+
+ win->dpy = XOpenDisplay(NULL);
+ if (NULL == win->dpy)
@@ -1124,8 +1119,10 @@
+ * c-basic-offset: 8
+ * End:
+ */
---- /dev/null
-+++ linux-2.6.17/arch/um/include/x11_kern.h
+Index: vanilla-2.6.18-rc4/arch/um/include/x11_kern.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vanilla-2.6.18-rc4/arch/um/include/x11_kern.h 2006-08-17 10:45:27.000000000 +0200
@@ -0,0 +1,9 @@
+/* x11_kern */
+
@@ -1136,8 +1133,10 @@
+void x11_mouse_input(struct x11_kerndata *kd, int key, int down,
+ int x, int y);
+void x11_cad(struct x11_kerndata *kd);
---- /dev/null
-+++ linux-2.6.17/arch/um/include/x11_user.h
+Index: vanilla-2.6.18-rc4/arch/um/include/x11_user.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vanilla-2.6.18-rc4/arch/um/include/x11_user.h 2006-08-17 10:45:27.000000000 +0200
@@ -0,0 +1,15 @@
+/* x11_user */
+
@@ -1154,84 +1153,10 @@
+struct fb_var_screeninfo* x11_get_var(struct x11_window *win);
+void* x11_get_fbmem(struct x11_window *win);
+
---- linux-2.6.17.orig/arch/um/kernel/um_arch.c
-+++ linux-2.6.17/arch/um/kernel/um_arch.c
-@@ -14,6 +14,7 @@
- #include "linux/bootmem.h"
- #include "linux/spinlock.h"
- #include "linux/utsname.h"
-+#include "linux/console.h"
- #include "linux/sysrq.h"
- #include "linux/seq_file.h"
- #include "linux/delay.h"
-@@ -58,7 +59,7 @@ static void add_arg(char *arg)
- strcat(command_line, arg);
- }
-
--struct cpuinfo_um boot_cpu_data = {
-+struct cpuinfo_um boot_cpu_data = {
- .loops_per_jiffy = 0,
- .ipi_pipe = { -1, -1 }
- };
-@@ -224,7 +225,7 @@ static int __init uml_ncpus_setup(char *
-
- __uml_setup("ncpus=", uml_ncpus_setup,
- "ncpus=<# of desired CPUs>\n"
--" This tells an SMP kernel how many virtual processors to start.\n\n"
-+" This tells an SMP kernel how many virtual processors to start.\n\n"
- );
- #endif
-
-@@ -406,7 +407,7 @@ int linux_main(int argc, char **argv)
- argv1_begin = argv[1];
- argv1_end = &argv[1][strlen(argv[1])];
- #endif
--
-+
- highmem = 0;
- iomem_size = (iomem_size + PAGE_SIZE - 1) & PAGE_MASK;
- max_physmem = get_kmem_end() - uml_physmem - iomem_size - MIN_VMALLOC;
-@@ -475,6 +476,8 @@ static struct notifier_block panic_exit_
- .priority = 0
- };
-
-+extern int console_use_vt; /* FIXME */
-+
- void __init setup_arch(char **cmdline_p)
- {
- atomic_notifier_chain_register(&panic_notifier_list,
-@@ -483,6 +486,9 @@ void __init setup_arch(char **cmdline_p)
- strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
- *cmdline_p = command_line;
- setup_hostinfo();
-+#if defined(CONFIG_DUMMY_CONSOLE)
-+ console_use_vt = 0;
-+#endif
- }
-
- void __init check_bugs(void)
---- linux-2.6.17.orig/drivers/video/fbmem.c
-+++ linux-2.6.17/drivers/video/fbmem.c
-@@ -1213,13 +1213,17 @@ fb_mmap(struct file *file, struct vm_are
- vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
- else
- vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-+#elif defined(CONFIG_UML)
-+ /* nothing */
- #else
- #warning What do we have to do here??
- #endif
-+#ifndef CONFIG_UML
- if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
- vma->vm_end - vma->vm_start, vma->vm_page_prot))
- return -EAGAIN;
- return 0;
-+#endif
- #endif /* !sparc32 */
- }
-
---- linux-2.6.17.orig/include/asm-um/irq.h
-+++ linux-2.6.17/include/asm-um/irq.h
+Index: vanilla-2.6.18-rc4/include/asm-um/irq.h
+===================================================================
+--- vanilla-2.6.18-rc4.orig/include/asm-um/irq.h 2006-06-18 03:49:35.000000000 +0200
++++ vanilla-2.6.18-rc4/include/asm-um/irq.h 2006-08-17 10:45:27.000000000 +0200
@@ -15,8 +15,9 @@
#define SIGIO_WRITE_IRQ 11
#define TELNETD_IRQ 12
@@ -1243,19 +1168,10 @@
#define NR_IRQS (LAST_IRQ + 1)
#endif
---- linux-2.6.17.orig/drivers/char/Kconfig
-+++ linux-2.6.17/drivers/char/Kconfig
-@@ -59,7 +59,7 @@ config VT_CONSOLE
-
- config HW_CONSOLE
- bool
-- depends on VT && !S390 && !UML
-+ depends on VT && !S390
- default y
-
- config SERIAL_NONSTANDARD
---- linux-2.6.17.orig/arch/um/Makefile
-+++ linux-2.6.17/arch/um/Makefile
+Index: vanilla-2.6.18-rc4/arch/um/Makefile
+===================================================================
+--- vanilla-2.6.18-rc4.orig/arch/um/Makefile 2006-06-18 03:49:35.000000000 +0200
++++ vanilla-2.6.18-rc4/arch/um/Makefile 2006-08-17 10:45:27.000000000 +0200
@@ -139,12 +139,22 @@ CPPFLAGS_vmlinux.lds = -U$(SUBARCH) \
#The wrappers will select whether using "malloc" or the kernel allocator.
LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
@@ -1267,7 +1183,7 @@
+endif
+UML_LIBS := -L/usr/$(libdir) -lutil
+ifeq ($(CONFIG_X11_FB),y)
-+UML_LIBS += -L/usr/X11R6/$(libdir) -lX11 -lXext
++UML_LIBS += -L/usr/X11R6/$(libdir) -lX11 -lXext -lXau -lXdmcp
+endif
+
CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS)
++++++ patches.xen.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-auto-common.diff new/patches.xen/xen3-auto-common.diff
--- old/patches.xen/xen3-auto-common.diff 2006-08-15 07:01:34.000000000 +0200
+++ new/patches.xen/xen3-auto-common.diff 2006-08-18 16:33:00.000000000 +0200
@@ -2,10 +2,10 @@
From: http://xenbits.xensource.com/xen-unstable.hg (tip 10901)
Acked-by: jbeulich@novell.com
-Index: head-2006-08-08/drivers/char/mem.c
+Index: linux-2.6.17/drivers/char/mem.c
===================================================================
---- head-2006-08-08.orig/drivers/char/mem.c 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/drivers/char/mem.c 2006-08-08 17:23:04.000000000 +0200
+--- linux-2.6.17.orig/drivers/char/mem.c 2006-08-17 16:51:36.000000000 +0200
++++ linux-2.6.17/drivers/char/mem.c 2006-08-17 16:51:45.000000000 +0200
@@ -101,6 +101,7 @@ static inline int valid_mmap_phys_addr_r
}
#endif
@@ -40,20 +40,20 @@
static const struct file_operations kmem_fops = {
.llseek = memory_lseek,
-Index: head-2006-08-08/drivers/char/tpm/Makefile
+Index: linux-2.6.17/drivers/char/tpm/Makefile
===================================================================
---- head-2006-08-08.orig/drivers/char/tpm/Makefile 2006-06-18 03:49:35.000000000 +0200
-+++ head-2006-08-08/drivers/char/tpm/Makefile 2006-08-08 17:23:04.000000000 +0200
+--- linux-2.6.17.orig/drivers/char/tpm/Makefile 2006-06-18 03:49:35.000000000 +0200
++++ linux-2.6.17/drivers/char/tpm/Makefile 2006-08-17 16:51:45.000000000 +0200
@@ -9,3 +9,5 @@ obj-$(CONFIG_TCG_TIS) += tpm_tis.o
obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o
obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o
+obj-$(CONFIG_TCG_XEN) += tpm_xenu.o
+tpm_xenu-y = tpm_xen.o tpm_vtpm.o
-Index: head-2006-08-08/drivers/char/tpm/tpm.c
+Index: linux-2.6.17/drivers/char/tpm/tpm.c
===================================================================
---- head-2006-08-08.orig/drivers/char/tpm/tpm.c 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/drivers/char/tpm/tpm.c 2006-08-08 17:23:04.000000000 +0200
+--- linux-2.6.17.orig/drivers/char/tpm/tpm.c 2006-08-17 16:51:36.000000000 +0200
++++ linux-2.6.17/drivers/char/tpm/tpm.c 2006-08-17 16:51:45.000000000 +0200
@@ -30,7 +30,9 @@
enum tpm_const {
@@ -174,10 +174,10 @@
return ret_size;
}
EXPORT_SYMBOL_GPL(tpm_read);
-Index: head-2006-08-08/drivers/char/tpm/tpm.h
+Index: linux-2.6.17/drivers/char/tpm/tpm.h
===================================================================
---- head-2006-08-08.orig/drivers/char/tpm/tpm.h 2006-06-18 03:49:35.000000000 +0200
-+++ head-2006-08-08/drivers/char/tpm/tpm.h 2006-08-08 17:23:04.000000000 +0200
+--- linux-2.6.17.orig/drivers/char/tpm/tpm.h 2006-06-18 03:49:35.000000000 +0200
++++ linux-2.6.17/drivers/char/tpm/tpm.h 2006-08-17 16:51:45.000000000 +0200
@@ -26,6 +26,13 @@
#include
#include
@@ -252,10 +252,10 @@
extern void tpm_get_timeouts(struct tpm_chip *);
extern void tpm_gen_interrupt(struct tpm_chip *);
extern void tpm_continue_selftest(struct tpm_chip *);
-Index: head-2006-08-08/drivers/char/tpm/tpm_vtpm.c
+Index: linux-2.6.17/drivers/char/tpm/tpm_vtpm.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2006-08-08/drivers/char/tpm/tpm_vtpm.c 2006-08-08 17:23:04.000000000 +0200
++++ linux-2.6.17/drivers/char/tpm/tpm_vtpm.c 2006-08-17 16:51:45.000000000 +0200
@@ -0,0 +1,547 @@
+/*
+ * Copyright (C) 2006 IBM Corporation
@@ -804,10 +804,10 @@
+ tpm_remove_hardware(dev);
+ kfree(vtpms);
+}
-Index: head-2006-08-08/drivers/char/tpm/tpm_vtpm.h
+Index: linux-2.6.17/drivers/char/tpm/tpm_vtpm.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2006-08-08/drivers/char/tpm/tpm_vtpm.h 2006-08-08 17:23:04.000000000 +0200
++++ linux-2.6.17/drivers/char/tpm/tpm_vtpm.h 2006-08-17 16:51:45.000000000 +0200
@@ -0,0 +1,68 @@
+#ifndef TPM_VTPM_H
+#define TPM_VTPM_H
@@ -877,10 +877,10 @@
+}
+
+#endif
-Index: head-2006-08-08/drivers/char/tpm/tpm_xen.c
+Index: linux-2.6.17/drivers/char/tpm/tpm_xen.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2006-08-08/drivers/char/tpm/tpm_xen.c 2006-08-08 17:23:04.000000000 +0200
++++ linux-2.6.17/drivers/char/tpm/tpm_xen.c 2006-08-17 16:51:45.000000000 +0200
@@ -0,0 +1,758 @@
+/*
+ * Copyright (c) 2005, IBM Corporation
@@ -1640,49 +1640,10 @@
+module_init(tpmif_init);
+
+MODULE_LICENSE("Dual BSD/GPL");
-Index: head-2006-08-08/drivers/char/tty_io.c
+Index: linux-2.6.17/include/linux/gfp.h
===================================================================
---- head-2006-08-08.orig/drivers/char/tty_io.c 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/drivers/char/tty_io.c 2006-08-08 17:23:04.000000000 +0200
-@@ -130,6 +130,8 @@ LIST_HEAD(tty_drivers); /* linked list
- vt.c for deeply disgusting hack reasons */
- DEFINE_MUTEX(tty_mutex);
-
-+int console_use_vt = 1;
-+
- #ifdef CONFIG_UNIX98_PTYS
- extern struct tty_driver *ptm_driver; /* Unix98 pty masters; for /dev/ptmx */
- extern int pty_limit; /* Config limit on Unix98 ptys */
-@@ -2048,7 +2050,7 @@ retry_open:
- goto got_driver;
- }
- #ifdef CONFIG_VT
-- if (device == MKDEV(TTY_MAJOR,0)) {
-+ if (console_use_vt && (device == MKDEV(TTY_MAJOR,0))) {
- extern struct tty_driver *console_driver;
- driver = console_driver;
- index = fg_console;
-@@ -3258,6 +3260,8 @@ static int __init tty_init(void)
- #endif
-
- #ifdef CONFIG_VT
-+ if (!console_use_vt)
-+ goto out_vt;
- cdev_init(&vc0_cdev, &console_fops);
- if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
- register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
-@@ -3265,6 +3269,7 @@ static int __init tty_init(void)
- class_device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
-
- vty_init();
-+ out_vt:
- #endif
- return 0;
- }
-Index: head-2006-08-08/include/linux/gfp.h
-===================================================================
---- head-2006-08-08.orig/include/linux/gfp.h 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/include/linux/gfp.h 2006-08-08 17:23:04.000000000 +0200
+--- linux-2.6.17.orig/include/linux/gfp.h 2006-08-17 16:51:33.000000000 +0200
++++ linux-2.6.17/include/linux/gfp.h 2006-08-17 16:51:45.000000000 +0200
@@ -99,7 +99,11 @@ static inline int gfp_zone(gfp_t gfp)
*/
@@ -1696,10 +1657,10 @@
#endif
extern struct page *
-Index: head-2006-08-08/include/linux/highmem.h
+Index: linux-2.6.17/include/linux/highmem.h
===================================================================
---- head-2006-08-08.orig/include/linux/highmem.h 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/include/linux/highmem.h 2006-08-08 17:23:04.000000000 +0200
+--- linux-2.6.17.orig/include/linux/highmem.h 2006-08-17 16:51:33.000000000 +0200
++++ linux-2.6.17/include/linux/highmem.h 2006-08-17 16:51:45.000000000 +0200
@@ -24,10 +24,16 @@ static inline void flush_kernel_dcache_p
/* declarations for linux/mm/highmem.c */
@@ -1717,10 +1678,10 @@
static inline void *kmap(struct page *page)
{
-Index: head-2006-08-08/include/linux/interrupt.h
+Index: linux-2.6.17/include/linux/interrupt.h
===================================================================
---- head-2006-08-08.orig/include/linux/interrupt.h 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/include/linux/interrupt.h 2006-08-08 17:23:04.000000000 +0200
+--- linux-2.6.17.orig/include/linux/interrupt.h 2006-08-17 16:51:33.000000000 +0200
++++ linux-2.6.17/include/linux/interrupt.h 2006-08-17 16:51:45.000000000 +0200
@@ -166,6 +166,12 @@ static inline int disable_irq_wake(unsig
#endif /* CONFIG_GENERIC_HARDIRQS */
@@ -1734,10 +1695,10 @@
#ifndef __ARCH_SET_SOFTIRQ_PENDING
#define set_softirq_pending(x) (local_softirq_pending() = (x))
#define or_softirq_pending(x) (local_softirq_pending() |= (x))
-Index: head-2006-08-08/include/linux/mm.h
+Index: linux-2.6.17/include/linux/mm.h
===================================================================
---- head-2006-08-08.orig/include/linux/mm.h 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/include/linux/mm.h 2006-08-08 17:23:04.000000000 +0200
+--- linux-2.6.17.orig/include/linux/mm.h 2006-08-17 16:51:44.000000000 +0200
++++ linux-2.6.17/include/linux/mm.h 2006-08-17 16:51:45.000000000 +0200
@@ -164,6 +164,9 @@ extern unsigned int kobjsize(const void
#define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
#define VM_MAPPED_COPY 0x01000000 /* T if mapped copy of data (nommu mmap) */
@@ -1762,10 +1723,10 @@
#ifdef CONFIG_PROC_FS
void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
#else
-Index: head-2006-08-08/include/linux/skbuff.h
+Index: linux-2.6.17/include/linux/skbuff.h
===================================================================
---- head-2006-08-08.orig/include/linux/skbuff.h 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/include/linux/skbuff.h 2006-08-08 17:23:05.000000000 +0200
+--- linux-2.6.17.orig/include/linux/skbuff.h 2006-08-17 16:51:40.000000000 +0200
++++ linux-2.6.17/include/linux/skbuff.h 2006-08-17 16:57:19.000000000 +0200
@@ -203,6 +203,8 @@ enum {
* @local_df: allow local fragmentation
* @cloned: Head may be cloned (check refcnt to be sure)
@@ -1799,10 +1760,10 @@
extern void kfree_skbmem(struct sk_buff *skb);
extern struct sk_buff *skb_clone(struct sk_buff *skb,
gfp_t priority);
-Index: head-2006-08-08/kernel/fork.c
+Index: linux-2.6.17/kernel/fork.c
===================================================================
---- head-2006-08-08.orig/kernel/fork.c 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/kernel/fork.c 2006-08-08 17:23:05.000000000 +0200
+--- linux-2.6.17.orig/kernel/fork.c 2006-08-17 16:51:40.000000000 +0200
++++ linux-2.6.17/kernel/fork.c 2006-08-17 16:51:45.000000000 +0200
@@ -275,6 +275,9 @@ static inline int dup_mmap(struct mm_str
if (retval)
goto out;
@@ -1813,10 +1774,10 @@
retval = 0;
out:
up_write(&mm->mmap_sem);
-Index: head-2006-08-08/kernel/irq/spurious.c
+Index: linux-2.6.17/kernel/irq/spurious.c
===================================================================
---- head-2006-08-08.orig/kernel/irq/spurious.c 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/kernel/irq/spurious.c 2006-08-08 17:23:05.000000000 +0200
+--- linux-2.6.17.orig/kernel/irq/spurious.c 2006-08-17 16:51:34.000000000 +0200
++++ linux-2.6.17/kernel/irq/spurious.c 2006-08-17 16:51:45.000000000 +0200
@@ -139,7 +139,8 @@ void note_interrupt(unsigned int irq, st
irqreturn_t action_ret, struct pt_regs *regs)
{
@@ -1827,10 +1788,10 @@
if (unlikely(action_ret != IRQ_NONE))
report_bad_irq(irq, desc, action_ret);
}
-Index: head-2006-08-08/lib/Makefile
+Index: linux-2.6.17/lib/Makefile
===================================================================
---- head-2006-08-08.orig/lib/Makefile 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/lib/Makefile 2006-08-08 17:23:05.000000000 +0200
+--- linux-2.6.17.orig/lib/Makefile 2006-08-17 16:51:34.000000000 +0200
++++ linux-2.6.17/lib/Makefile 2006-08-17 16:51:45.000000000 +0200
@@ -51,6 +51,9 @@ obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
obj-$(CONFIG_SMP) += percpu_counter.o
@@ -1841,10 +1802,10 @@
hostprogs-y := gen_crc32table
clean-files := crc32table.h
-Index: head-2006-08-08/mm/highmem.c
+Index: linux-2.6.17/mm/highmem.c
===================================================================
---- head-2006-08-08.orig/mm/highmem.c 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/mm/highmem.c 2006-08-08 17:23:05.000000000 +0200
+--- linux-2.6.17.orig/mm/highmem.c 2006-08-17 16:51:34.000000000 +0200
++++ linux-2.6.17/mm/highmem.c 2006-08-17 16:51:45.000000000 +0200
@@ -142,6 +142,17 @@ start:
return vaddr;
}
@@ -1863,10 +1824,10 @@
void fastcall *kmap_high(struct page *page)
{
unsigned long vaddr;
-Index: head-2006-08-08/mm/memory.c
+Index: linux-2.6.17/mm/memory.c
===================================================================
---- head-2006-08-08.orig/mm/memory.c 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/mm/memory.c 2006-08-08 17:23:05.000000000 +0200
+--- linux-2.6.17.orig/mm/memory.c 2006-08-17 16:51:44.000000000 +0200
++++ linux-2.6.17/mm/memory.c 2006-08-17 16:51:45.000000000 +0200
@@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
* and that the resulting page looks ok.
*/
@@ -2007,10 +1968,10 @@
/*
* handle_pte_fault chooses page fault handler according to an entry
* which was read non-atomically. Before making any commitment, on
-Index: head-2006-08-08/mm/mmap.c
+Index: linux-2.6.17/mm/mmap.c
===================================================================
---- head-2006-08-08.orig/mm/mmap.c 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/mm/mmap.c 2006-08-08 17:23:05.000000000 +0200
+--- linux-2.6.17.orig/mm/mmap.c 2006-08-17 16:51:34.000000000 +0200
++++ linux-2.6.17/mm/mmap.c 2006-08-17 16:51:45.000000000 +0200
@@ -1950,6 +1950,10 @@ void exit_mmap(struct mm_struct *mm)
unsigned long nr_accounted = 0;
unsigned long end;
@@ -2022,10 +1983,10 @@
lru_add_drain();
flush_cache_mm(mm);
tlb = tlb_gather_mmu(mm, 1);
-Index: head-2006-08-08/mm/page_alloc.c
+Index: linux-2.6.17/mm/page_alloc.c
===================================================================
---- head-2006-08-08.orig/mm/page_alloc.c 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/mm/page_alloc.c 2006-08-08 17:23:05.000000000 +0200
+--- linux-2.6.17.orig/mm/page_alloc.c 2006-08-17 16:51:44.000000000 +0200
++++ linux-2.6.17/mm/page_alloc.c 2006-08-17 16:51:45.000000000 +0200
@@ -443,7 +443,8 @@ static void __free_pages_ok(struct page
int i;
int reserved = 0;
@@ -2046,10 +2007,10 @@
if (PageAnon(page))
page->mapping = NULL;
-Index: head-2006-08-08/net/core/dev.c
+Index: linux-2.6.17/net/core/dev.c
===================================================================
---- head-2006-08-08.orig/net/core/dev.c 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/net/core/dev.c 2006-08-08 17:23:05.000000000 +0200
+--- linux-2.6.17.orig/net/core/dev.c 2006-08-17 16:51:43.000000000 +0200
++++ linux-2.6.17/net/core/dev.c 2006-08-17 16:51:45.000000000 +0200
@@ -117,6 +117,12 @@
#include
#include
@@ -2148,10 +2109,10 @@
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
EXPORT_SYMBOL(br_handle_frame_hook);
-Index: head-2006-08-08/net/core/skbuff.c
+Index: linux-2.6.17/net/core/skbuff.c
===================================================================
---- head-2006-08-08.orig/net/core/skbuff.c 2006-08-08 17:18:51.000000000 +0200
-+++ head-2006-08-08/net/core/skbuff.c 2006-08-08 17:23:05.000000000 +0200
+--- linux-2.6.17.orig/net/core/skbuff.c 2006-08-17 16:51:40.000000000 +0200
++++ linux-2.6.17/net/core/skbuff.c 2006-08-17 16:51:45.000000000 +0200
@@ -139,6 +139,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
* Buffers may only be allocated from interrupts using a @gfp_mask of
* %GFP_ATOMIC.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-auto-xen-kconfig.diff new/patches.xen/xen3-auto-xen-kconfig.diff
--- old/patches.xen/xen3-auto-xen-kconfig.diff 2006-08-15 07:01:35.000000000 +0200
+++ new/patches.xen/xen3-auto-xen-kconfig.diff 2006-08-18 16:33:00.000000000 +0200
@@ -2,10 +2,10 @@
From: http://xenbits.xensource.com/xen-unstable.hg (tip 10982)
Acked-by: jbeulich@novell.com
-Index: head-2006-08-08/arch/i386/Kconfig
+Index: linux-2.6.17/arch/i386/Kconfig
===================================================================
---- head-2006-08-08.orig/arch/i386/Kconfig 2006-08-09 17:30:33.000000000 +0200
-+++ head-2006-08-08/arch/i386/Kconfig 2006-08-11 09:33:57.000000000 +0200
+--- linux-2.6.17.orig/arch/i386/Kconfig 2006-08-17 16:42:45.000000000 +0200
++++ linux-2.6.17/arch/i386/Kconfig 2006-08-17 16:43:10.000000000 +0200
@@ -103,6 +103,15 @@ config X86_PC
help
Choose this option if your computer is a standard PC or compatible.
@@ -285,10 +285,10 @@
config KTIME_SCALAR
bool
default y
-Index: head-2006-08-08/arch/i386/Kconfig.cpu
+Index: linux-2.6.17/arch/i386/Kconfig.cpu
===================================================================
---- head-2006-08-08.orig/arch/i386/Kconfig.cpu 2006-08-09 17:30:33.000000000 +0200
-+++ head-2006-08-08/arch/i386/Kconfig.cpu 2006-08-08 17:21:02.000000000 +0200
+--- linux-2.6.17.orig/arch/i386/Kconfig.cpu 2006-08-17 16:42:45.000000000 +0200
++++ linux-2.6.17/arch/i386/Kconfig.cpu 2006-08-17 16:43:10.000000000 +0200
@@ -251,7 +251,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -298,10 +298,10 @@
default y
config X86_WP_WORKS_OK
-Index: head-2006-08-08/arch/i386/Kconfig.debug
+Index: linux-2.6.17/arch/i386/Kconfig.debug
===================================================================
---- head-2006-08-08.orig/arch/i386/Kconfig.debug 2006-08-09 17:30:33.000000000 +0200
-+++ head-2006-08-08/arch/i386/Kconfig.debug 2006-08-08 17:21:02.000000000 +0200
+--- linux-2.6.17.orig/arch/i386/Kconfig.debug 2006-08-17 16:42:45.000000000 +0200
++++ linux-2.6.17/arch/i386/Kconfig.debug 2006-08-17 16:43:10.000000000 +0200
@@ -79,6 +79,7 @@ config X86_MPPARSE
config DOUBLEFAULT
default y
@@ -310,10 +310,10 @@
help
This option allows trapping of rare doublefault exceptions that
would otherwise cause a system to silently reboot. Disabling this
-Index: head-2006-08-08/arch/x86_64/Kconfig
+Index: linux-2.6.17/arch/x86_64/Kconfig
===================================================================
---- head-2006-08-08.orig/arch/x86_64/Kconfig 2006-08-09 17:30:33.000000000 +0200
-+++ head-2006-08-08/arch/x86_64/Kconfig 2006-08-11 09:33:27.000000000 +0200
+--- linux-2.6.17.orig/arch/x86_64/Kconfig 2006-08-17 16:42:45.000000000 +0200
++++ linux-2.6.17/arch/x86_64/Kconfig 2006-08-17 16:43:10.000000000 +0200
@@ -131,6 +131,22 @@ config GENERIC_CPU
endchoice
@@ -505,10 +505,10 @@
+source "drivers/xen/Kconfig"
+
source "lib/Kconfig"
-Index: head-2006-08-08/drivers/acpi/Kconfig
+Index: linux-2.6.17/drivers/acpi/Kconfig
===================================================================
---- head-2006-08-08.orig/drivers/acpi/Kconfig 2006-08-09 17:30:33.000000000 +0200
-+++ head-2006-08-08/drivers/acpi/Kconfig 2006-08-08 17:21:02.000000000 +0200
+--- linux-2.6.17.orig/drivers/acpi/Kconfig 2006-08-17 16:42:45.000000000 +0200
++++ linux-2.6.17/drivers/acpi/Kconfig 2006-08-17 16:43:10.000000000 +0200
@@ -45,7 +45,7 @@ if ACPI
config ACPI_SLEEP
@@ -526,10 +526,10 @@
default y
help
The Power Management Timer is available on all ACPI-capable,
-Index: head-2006-08-08/drivers/char/tpm/Kconfig
+Index: linux-2.6.17/drivers/char/tpm/Kconfig
===================================================================
---- head-2006-08-08.orig/drivers/char/tpm/Kconfig 2006-08-09 17:30:33.000000000 +0200
-+++ head-2006-08-08/drivers/char/tpm/Kconfig 2006-08-08 17:21:02.000000000 +0200
+--- linux-2.6.17.orig/drivers/char/tpm/Kconfig 2006-08-17 16:42:45.000000000 +0200
++++ linux-2.6.17/drivers/char/tpm/Kconfig 2006-08-17 16:43:10.000000000 +0200
@@ -58,5 +58,13 @@ config TCG_INFINEON
Further information on this driver and the supported hardware
can be found at http://www.prosec.rub.de/tpm
@@ -545,10 +545,10 @@
+ will be called tpm_xenu.
+endmenu
-Index: head-2006-08-08/drivers/firmware/Kconfig
+Index: linux-2.6.17/drivers/firmware/Kconfig
===================================================================
---- head-2006-08-08.orig/drivers/firmware/Kconfig 2006-08-09 17:30:33.000000000 +0200
-+++ head-2006-08-08/drivers/firmware/Kconfig 2006-08-08 17:21:02.000000000 +0200
+--- linux-2.6.17.orig/drivers/firmware/Kconfig 2006-08-17 16:42:45.000000000 +0200
++++ linux-2.6.17/drivers/firmware/Kconfig 2006-08-17 16:43:10.000000000 +0200
@@ -7,7 +7,7 @@ menu "Firmware Drivers"
config EDD
@@ -558,10 +558,10 @@
help
Say Y or M here if you want to enable BIOS Enhanced Disk Drive
Services real mode BIOS calls to determine which disk
-Index: head-2006-08-08/drivers/pci/Kconfig
+Index: linux-2.6.17/drivers/pci/Kconfig
===================================================================
---- head-2006-08-08.orig/drivers/pci/Kconfig 2006-08-09 17:30:33.000000000 +0200
-+++ head-2006-08-08/drivers/pci/Kconfig 2006-08-08 17:21:02.000000000 +0200
+--- linux-2.6.17.orig/drivers/pci/Kconfig 2006-08-17 16:42:45.000000000 +0200
++++ linux-2.6.17/drivers/pci/Kconfig 2006-08-17 16:43:10.000000000 +0200
@@ -5,6 +5,7 @@ config PCI_MSI
bool "Message Signaled Interrupts (MSI and MSI-X)"
depends on PCI
@@ -570,22 +570,22 @@
help
This allows device drivers to enable MSI (Message Signaled
Interrupts). Message Signaled Interrupts enable a device to
-Index: head-2006-08-08/drivers/serial/Kconfig
+Index: linux-2.6.17/drivers/serial/Kconfig
===================================================================
---- head-2006-08-08.orig/drivers/serial/Kconfig 2006-08-09 17:30:33.000000000 +0200
-+++ head-2006-08-08/drivers/serial/Kconfig 2006-08-08 17:21:02.000000000 +0200
-@@ -11,6 +11,7 @@ menu "Serial drivers"
- config SERIAL_8250
+--- linux-2.6.17.orig/drivers/serial/Kconfig 2006-08-17 16:42:45.000000000 +0200
++++ linux-2.6.17/drivers/serial/Kconfig 2006-08-17 16:43:37.000000000 +0200
+@@ -12,6 +12,7 @@ config SERIAL_8250
tristate "8250/16550 and compatible serial support"
depends on (BROKEN || !SPARC)
+ depends on !UML
+ depends on !XEN_DISABLE_SERIAL
select SERIAL_CORE
---help---
This selects whether you want to include the driver for the standard
-Index: head-2006-08-08/drivers/video/console/Kconfig
+Index: linux-2.6.17/drivers/video/console/Kconfig
===================================================================
---- head-2006-08-08.orig/drivers/video/console/Kconfig 2006-06-18 03:49:35.000000000 +0200
-+++ head-2006-08-08/drivers/video/console/Kconfig 2006-08-08 17:21:02.000000000 +0200
+--- linux-2.6.17.orig/drivers/video/console/Kconfig 2006-08-17 16:42:45.000000000 +0200
++++ linux-2.6.17/drivers/video/console/Kconfig 2006-08-17 16:43:10.000000000 +0200
@@ -52,7 +52,7 @@ config VGACON_SOFT_SCROLLBACK_SIZE
config VIDEO_SELECT
@@ -595,10 +595,10 @@
---help---
This enables support for text mode selection on kernel startup. If
you want to take advantage of some high-resolution text mode your
-Index: head-2006-08-08/drivers/xen/Kconfig
+Index: linux-2.6.17/drivers/xen/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2006-08-08/drivers/xen/Kconfig 2006-08-11 09:33:27.000000000 +0200
++++ linux-2.6.17/drivers/xen/Kconfig 2006-08-17 16:43:10.000000000 +0200
@@ -0,0 +1,260 @@
+#
+# This Kconfig describe xen options
@@ -860,10 +860,10 @@
+ depends on SMP
+
+endif
-Index: head-2006-08-08/fs/Kconfig
+Index: linux-2.6.17/fs/Kconfig
===================================================================
---- head-2006-08-08.orig/fs/Kconfig 2006-08-09 17:30:33.000000000 +0200
-+++ head-2006-08-08/fs/Kconfig 2006-08-08 17:21:02.000000000 +0200
+--- linux-2.6.17.orig/fs/Kconfig 2006-08-17 16:42:45.000000000 +0200
++++ linux-2.6.17/fs/Kconfig 2006-08-17 16:43:10.000000000 +0200
@@ -890,6 +890,7 @@ config TMPFS_POSIX_ACL
config HUGETLBFS
bool "HugeTLB file system support"
@@ -872,10 +872,10 @@
help
hugetlbfs is a filesystem backing for HugeTLB pages, based on
ramfs. For architectures that support it, say Y here and read
-Index: head-2006-08-08/kernel/Kconfig.preempt
+Index: linux-2.6.17/kernel/Kconfig.preempt
===================================================================
---- head-2006-08-08.orig/kernel/Kconfig.preempt 2006-08-09 17:30:33.000000000 +0200
-+++ head-2006-08-08/kernel/Kconfig.preempt 2006-08-08 17:21:02.000000000 +0200
+--- linux-2.6.17.orig/kernel/Kconfig.preempt 2006-08-17 16:42:45.000000000 +0200
++++ linux-2.6.17/kernel/Kconfig.preempt 2006-08-17 16:43:10.000000000 +0200
@@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY
config PREEMPT
@@ -884,10 +884,10 @@
help
This option reduces the latency of the kernel by making
all kernel code (that is not executing in a critical section)
-Index: head-2006-08-08/mm/Kconfig
+Index: linux-2.6.17/mm/Kconfig
===================================================================
---- head-2006-08-08.orig/mm/Kconfig 2006-08-09 17:30:33.000000000 +0200
-+++ head-2006-08-08/mm/Kconfig 2006-08-08 17:21:02.000000000 +0200
+--- linux-2.6.17.orig/mm/Kconfig 2006-08-17 16:42:45.000000000 +0200
++++ linux-2.6.17/mm/Kconfig 2006-08-17 16:43:10.000000000 +0200
@@ -127,11 +127,14 @@ comment "Memory hotplug is currently inc
# Default to 4 for wider testing, though 8 might be more appropriate.
# ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
++++++ series.conf ++++++
--- kernel-source/series.conf 2006-08-16 14:16:12.000000000 +0200
+++ kernel-source/series.conf 2006-08-18 17:24:30.000000000 +0200
@@ -134,6 +134,7 @@
# Fix ISA DMA resource setup in ACPIPnP (#116655)
patches.fixes/acpipnp-dma-resource-setup-fix.patch
+ patches.fixes/workqueue-remove-lock_cpu_hotplug.patch
########################################################
# Suse specific stuff
@@ -470,6 +471,7 @@
patches.fixes/um-missing-exports.diff
### kraxel's uml framebuffer driver
+ patches.uml/uml-kconfig
patches.uml/uml-x11-fb
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org