From 5aa993108b369c8a0e7a48b793ae96d9ae159239 Mon Sep 17 00:00:00 2001
From: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
Date: Wed, 21 Nov 2007 15:07:05 -0800
Subject: [PATCH] --- yaml --- r: 82310 b: refs/heads/master c:
 74e27e44b0407fb1f6e8d1f7b7818f108463c4b8 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/pci/pci-driver.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 252578cd05b8..6dc4f180dbf0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53a9bf4267b8b1f958dbeb7c8c1ef21c82229b71
+refs/heads/master: 74e27e44b0407fb1f6e8d1f7b7818f108463c4b8
diff --git a/trunk/drivers/pci/pci-driver.c b/trunk/drivers/pci/pci-driver.c
index c4fa35d1dd77..e571c72e6753 100644
--- a/trunk/drivers/pci/pci-driver.c
+++ b/trunk/drivers/pci/pci-driver.c
@@ -186,13 +186,11 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
 	    set_cpus_allowed(current, node_to_cpumask(node));
 	/* And set default memory allocation policy */
 	oldpol = current->mempolicy;
-	current->mempolicy = &default_policy;
-	mpol_get(current->mempolicy);
+	current->mempolicy = NULL;	/* fall back to system default policy */
 #endif
 	error = drv->probe(dev, id);
 #ifdef CONFIG_NUMA
 	set_cpus_allowed(current, oldmask);
-	mpol_free(current->mempolicy);
 	current->mempolicy = oldpol;
 #endif
 	return error;