Merge branch 'xen-upstream' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

* 'xen-upstream' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: (44 commits)
  xen: disable all non-virtual drivers
  xen: use iret directly when possible
  xen: suppress abs symbol warnings for unused reloc pointers
  xen: Attempt to patch inline versions of common operations
  xen: Place vcpu_info structure into per-cpu memory
  xen: handle external requests for shutdown, reboot and sysrq
  xen: machine operations
  xen: add virtual network device driver
  xen: add virtual block device driver.
  xen: add the Xenbus sysfs and virtual device hotplug driver
  xen: Add grant table support
  xen: use the hvc console infrastructure for Xen console
  xen: hack to prevent bad segment register reload
  xen: lazy-mmu operations
  xen: Add support for preemption
  xen: SMP guest support
  xen: Implement sched_clock
  xen: Account for stolen time
  xen: ignore RW mapping of RO pages in pagetable_init
  xen: Complete pagetable pinning
  ...

2 files changed, 6 insertions, 39 deletions

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index a786e78632..1ea2f86f76 100644
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -125,7 +125,7 @@ static void br_stp_start(struct net_bridge *br)
         char *argv[] = { BR_STP_PROG, br->dev->name, "start", NULL };
         char *envp[] = { NULL };
 
-        r = call_usermodehelper(BR_STP_PROG, argv, envp, 1);
+        r = call_usermodehelper(BR_STP_PROG, argv, envp, UMH_WAIT_PROC);
         if (r == 0) {
                 br->stp_enabled = BR_USER_STP;
                 printk(KERN_INFO "%s: userspace STP started\n", br->dev->name);
diff --git a/net/irda/irias_object.c b/net/irda/irias_object.c
index 4adaae242b..cf30245709 100644
--- a/net/irda/irias_object.c
+++ b/net/irda/irias_object.c
@@ -36,39 +36,6 @@ hashbin_t *irias_objects;
  */
 struct ias_value irias_missing = { IAS_MISSING, 0, 0, 0, {0}};
 
-/*
- * Function strndup (str, max)
- *
- *    My own kernel version of strndup!
- *
- * Faster, check boundary... Jean II
- */
-static char *strndup(char *str, size_t max)
-{
-        char *new_str;
-        int len;
-
-        /* Check string */
-        if (str == NULL)
-                return NULL;
-        /* Check length, truncate */
-        len = strlen(str);
-        if(len > max)
-                len = max;
-
-        /* Allocate new string */
-        new_str = kmalloc(len + 1, GFP_ATOMIC);
-        if (new_str == NULL) {
-                IRDA_WARNING("%s: Unable to kmalloc!\n", __FUNCTION__);
-                return NULL;
-        }
-
-        /* Copy and truncate */
-        memcpy(new_str, str, len);
-        new_str[len] = '\0';
-
-        return new_str;
-}
 
 /*
  * Function ias_new_object (name, id)
@@ -90,7 +57,7 @@ struct ias_object *irias_new_object( char *name, int id)
         }
 
         obj->magic = IAS_OBJECT_MAGIC;
-        obj->name = strndup(name, IAS_MAX_CLASSNAME);
+        obj->name = kstrndup(name, IAS_MAX_CLASSNAME, GFP_ATOMIC);
         if (!obj->name) {
                 IRDA_WARNING("%s(), Unable to allocate name!\n",
                              __FUNCTION__);
@@ -360,7 +327,7 @@ void irias_add_integer_attrib(struct ias_object *obj, char *name, int value,
         }
 
         attrib->magic = IAS_ATTRIB_MAGIC;
-        attrib->name = strndup(name, IAS_MAX_ATTRIBNAME);
+        attrib->name = kstrndup(name, IAS_MAX_ATTRIBNAME, GFP_ATOMIC);
 
         /* Insert value */
         attrib->value = irias_new_integer_value(value);
@@ -404,7 +371,7 @@ void irias_add_octseq_attrib(struct ias_object *obj, char *name, __u8 *octets,
         }
 
         attrib->magic = IAS_ATTRIB_MAGIC;
-        attrib->name = strndup(name, IAS_MAX_ATTRIBNAME);
+        attrib->name = kstrndup(name, IAS_MAX_ATTRIBNAME, GFP_ATOMIC);
 
         attrib->value = irias_new_octseq_value( octets, len);
         if (!attrib->name || !attrib->value) {
@@ -446,7 +413,7 @@ void irias_add_string_attrib(struct ias_object *obj, char *name, char *value,
         }
 
         attrib->magic = IAS_ATTRIB_MAGIC;
-        attrib->name = strndup(name, IAS_MAX_ATTRIBNAME);
+        attrib->name = kstrndup(name, IAS_MAX_ATTRIBNAME, GFP_ATOMIC);
 
         attrib->value = irias_new_string_value(value);
         if (!attrib->name || !attrib->value) {
@@ -506,7 +473,7 @@ struct ias_value *irias_new_string_value(char *string)
 
         value->type = IAS_STRING;
         value->charset = CS_ASCII;
-        value->t.string = strndup(string, IAS_MAX_STRING);
+        value->t.string = kstrndup(string, IAS_MAX_STRING, GFP_ATOMIC);
         if (!value->t.string) {
                 IRDA_WARNING("%s: Unable to kmalloc!\n", __FUNCTION__);
                 kfree(value);