[kernel] r7278 - in dists/sid/linux-2.6/debian: . patches patches/series

[Bastian Blank]

Author: waldi
Date: Wed Aug 30 19:27:29 2006
New Revision: 7278

Added:
   dists/sid/linux-2.6/debian/patches/xen-unstable-11253-backport.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/8-extra

Log:
* debian/changelog: Update.
* debian/patches/series/8-extra: xen-unstable-11253-backport.patch.
* debian/patches/xen-unstable-11253-backport.patch: Add.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Wed Aug 30 19:27:29 2006
@@ -21,7 +21,10 @@
   * sym2: only claim "Storage" class devices - the cpqarray driver should be
     used for 5c1510 devices in RAID mode. (closes: #380272)
 
- -- dann frazier <dannf at debian.org>  Tue, 29 Aug 2006 18:44:26 -0600
+  [ Bastian Blank ]
+  * Backport change to allow all hypercalls for xen. 
+
+ -- Bastian Blank <waldi at debian.org>  Wed, 30 Aug 2006 19:25:00 +0000
 
 linux-2.6 (2.6.17-7) unstable; urgency=low
 

Modified: dists/sid/linux-2.6/debian/patches/series/8-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/8-extra	(original)
+++ dists/sid/linux-2.6/debian/patches/series/8-extra	Wed Aug 30 19:27:29 2006
@@ -1,2 +1,3 @@
 + pa8800-abstract-kmap.patch hppa
 + pa8800-kmap-implementation.patch hppa
++ xen-unstable-11253-backport.patch *_xen *_xen-vserver

Added: dists/sid/linux-2.6/debian/patches/xen-unstable-11253-backport.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/xen-unstable-11253-backport.patch	Wed Aug 30 19:27:29 2006
@@ -0,0 +1,45 @@
+--- linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Thu Aug 24 17:24:54 2006 +0100
++++ linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Thu Aug 24 17:58:28 2006 +0100
+@@ -35,9 +35,6 @@ static struct proc_dir_entry *privcmd_in
+ static struct proc_dir_entry *privcmd_intf;
+ static struct proc_dir_entry *capabilities_intf;
+ 
+-#define NR_HYPERCALLS 64
+-static DECLARE_BITMAP(hypercall_permission_map, NR_HYPERCALLS);
+-
+ static int privcmd_ioctl(struct inode *inode, struct file *file,
+ 			 unsigned int cmd, unsigned long data)
+ {
+@@ -50,12 +47,6 @@ static int privcmd_ioctl(struct inode *i
+   
+ 		if (copy_from_user(&hypercall, udata, sizeof(hypercall)))
+ 			return -EFAULT;
+-
+-		/* Check hypercall number for validity. */
+-		if (hypercall.op >= NR_HYPERCALLS)
+-			return -EINVAL;
+-		if (!test_bit(hypercall.op, hypercall_permission_map))
+-			return -EINVAL;
+ 
+ #if defined(__i386__)
+ 		__asm__ __volatile__ (
+@@ -262,19 +253,6 @@ static int __init privcmd_init(void)
+ 	if (!is_running_on_xen())
+ 		return -ENODEV;
+ 
+-	/* Set of hypercalls that privileged applications may execute. */
+-	set_bit(__HYPERVISOR_acm_op,           hypercall_permission_map);
+-	set_bit(__HYPERVISOR_dom0_op,          hypercall_permission_map);
+-	set_bit(__HYPERVISOR_event_channel_op, hypercall_permission_map);
+-	set_bit(__HYPERVISOR_memory_op,        hypercall_permission_map);
+-	set_bit(__HYPERVISOR_mmu_update,       hypercall_permission_map);
+-	set_bit(__HYPERVISOR_mmuext_op,        hypercall_permission_map);
+-	set_bit(__HYPERVISOR_xen_version,      hypercall_permission_map);
+-	set_bit(__HYPERVISOR_sched_op,         hypercall_permission_map);
+-	set_bit(__HYPERVISOR_sched_op_compat,  hypercall_permission_map);
+-	set_bit(__HYPERVISOR_event_channel_op_compat,
+-		hypercall_permission_map);
+-
+ 	privcmd_intf = create_xen_proc_entry("privcmd", 0400);
+ 	if (privcmd_intf != NULL)
+ 		privcmd_intf->proc_fops = &privcmd_file_ops;