rpms/kernel-xen/devel kernel-xen.spec, 1.61, 1.62 linux-2.6-execshield-xen.patch, 1.3, 1.4 linux-2.6.14-xen-compile-fixes.patch, 1.2, 1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Feb 11 03:31:57 UTC 2006
Author: quintela
Update of /cvs/dist/rpms/kernel-xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24694
Modified Files:
kernel-xen.spec linux-2.6-execshield-xen.patch
linux-2.6.14-xen-compile-fixes.patch
Log Message:
more x86_64 xen fixes
Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kernel-xen.spec 10 Feb 2006 19:40:40 -0000 1.61
+++ kernel-xen.spec 11 Feb 2006 03:31:22 -0000 1.62
@@ -250,7 +250,7 @@
# 700 - 799 Xen
Patch700: linux-2.6-xen-merge.patch
-#Patch701: linux-2.6.14-xen-compile-fixes.patch
+Patch701: linux-2.6.14-xen-compile-fixes.patch
Patch702: linux-2.6-xen-no-tls-warn.patch
Patch704: linux-2.6.14-xen-guest-enable-char-devices.patch
Patch705: linux-2.6.14-xen_net_read_mac_export.patch
@@ -755,7 +755,7 @@
%if %{includexen}
# Base Xen patch from linux-2.6-merge.hg
%patch700 -p1
-#%patch701 -p1
+%patch701 -p1
%patch702 -p1
%patch704 -p1
%patch705 -p1
linux-2.6-execshield-xen.patch:
arch/i386/kernel/entry-xen.S | 8 +
arch/i386/kernel/process-xen.c | 58 +++++++++++
arch/i386/kernel/smp-xen.c | 2
arch/i386/kernel/traps-xen.c | 93 ++++++++++++++++++-
arch/i386/mm/init-xen.c | 11 +-
linux-2.6.14/include/asm-i386/desc.h | 5 +
linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c | 23 ----
7 files changed, 171 insertions(+), 29 deletions(-)
Index: linux-2.6-execshield-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-execshield-xen.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-execshield-xen.patch 9 Jan 2006 20:42:13 -0000 1.3
+++ linux-2.6-execshield-xen.patch 11 Feb 2006 03:31:22 -0000 1.4
@@ -296,3 +296,44 @@
extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/setup64-xen.c linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c
+--- linux-2.6.15.orig/arch/x86_64/kernel/setup64-xen.c 2006-02-10 20:25:28.000000000 +0100
++++ linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c 2006-02-10 21:27:22.000000000 +0100
+@@ -51,7 +51,7 @@ Control non executable mappings for 64bi
+ on Enable(default)
+ off Disable
+ */
+-int __init nonx_setup(char *str)
++void __init nonx_setup(const char *str)
+ {
+ if (!strncmp(str, "on", 2)) {
+ __supported_pte_mask |= _PAGE_NX;
+@@ -60,28 +60,7 @@ int __init nonx_setup(char *str)
+ do_not_nx = 1;
+ __supported_pte_mask &= ~_PAGE_NX;
+ }
+- return 0;
+-}
+-__setup("noexec=", nonx_setup); /* parsed early actually */
+-
+-int force_personality32 = READ_IMPLIES_EXEC;
+-
+-/* noexec32=on|off
+-Control non executable heap for 32bit processes.
+-To control the stack too use noexec=off
+-
+-on PROT_READ does not imply PROT_EXEC for 32bit processes
+-off PROT_READ implies PROT_EXEC (default)
+-*/
+-static int __init nonx32_setup(char *str)
+-{
+- if (!strcmp(str, "on"))
+- force_personality32 &= ~READ_IMPLIES_EXEC;
+- else if (!strcmp(str, "off"))
+- force_personality32 |= READ_IMPLIES_EXEC;
+- return 0;
+ }
+-__setup("noexec32=", nonx32_setup);
+
+ /*
+ * Great future plan:
linux-2.6.14-xen-compile-fixes.patch:
apic-xen.c | 9 +++++++++
1 files changed, 9 insertions(+)
Index: linux-2.6.14-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6.14-xen-compile-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.14-xen-compile-fixes.patch 11 Jan 2006 19:49:30 -0000 1.2
+++ linux-2.6.14-xen-compile-fixes.patch 11 Feb 2006 03:31:22 -0000 1.3
@@ -1,63 +1,19 @@
---- linux-2.6.14/drivers/xen/netback/xenbus.c.~1~ 2006-01-09 10:50:45.000000000 -0500
-+++ linux-2.6.14/drivers/xen/netback/xenbus.c 2006-01-09 10:54:58.000000000 -0500
-@@ -129,12 +129,12 @@
- return err;
- }
- else {
-- add_uevent_var(envp, num_envp, &i, buffer, buffer_size,
-+ add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size,
- &length, "script=%s", val);
- kfree(val);
- }
-
-- add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
-+ add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length,
- "vif=%s", netif->dev->name);
-
- envp[i] = NULL;
-@@ -181,7 +181,7 @@
- return;
- }
-
-- kobject_uevent(&dev->dev.kobj, KOBJ_ONLINE);
-+ kobject_hotplug(&dev->dev.kobj, KOBJ_ONLINE);
-
- maybe_connect(be);
- }
-@@ -214,7 +214,7 @@
- break;
-
- case XenbusStateClosed:
-- kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE);
-+ kobject_hotplug(&dev->dev.kobj, KOBJ_OFFLINE);
- device_unregister(&dev->dev);
- break;
-
---- linux-2.6.14/drivers/xen/xenbus/xenbus_probe.c.~1~ 2006-01-09 10:50:22.000000000 -0500
-+++ linux-2.6.14/drivers/xen/xenbus/xenbus_probe.c 2006-01-09 10:59:20.000000000 -0500
-@@ -232,7 +232,7 @@
- .bus = {
- .name = "xen-backend",
- .match = xenbus_match,
-- .uevent = xenbus_uevent_backend,
-+ .hotplug = xenbus_uevent_backend,
- },
- .dev = {
- .bus_id = "xen-backend",
-@@ -257,13 +257,13 @@
- return -ENODEV;
-
- /* stuff we want to pass to /sbin/hotplug */
-- add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
-+ add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length,
- "XENBUS_TYPE=%s", xdev->devicetype);
-
-- add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
-+ add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length,
- "XENBUS_PATH=%s", xdev->nodename);
-
-- add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
-+ add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length,
- "XENBUS_BASE_PATH=%s", xenbus_backend.root);
-
- /* terminate, set to next free slot, shrink available space */
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/apic-xen.c linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c
+--- linux-2.6.15.orig/arch/x86_64/kernel/apic-xen.c 2006-02-10 20:25:27.000000000 +0100
++++ linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c 2006-02-11 03:11:49.000000000 +0100
+@@ -42,6 +42,15 @@
+ int apic_verbosity;
+ int disable_apic;
+
++/*
++ * 'what should we do if we get a hw irq event on an illegal vector'.
++ * each architecture has to answer this themselves.
++ */
++void ack_bad_irq(unsigned int irq)
++{
++ printk("unexpected IRQ trap at vector %02x\n", irq);
++}
++
+ void smp_local_timer_interrupt(struct pt_regs *regs)
+ {
+ profile_tick(CPU_PROFILING, regs);
More information about the fedora-cvs-commits
mailing list