Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 82310
b: refs/heads/master
c: 74e27e4
h: refs/heads/master
v: v3
  • Loading branch information
Lee Schermerhorn authored and Greg Kroah-Hartman committed Feb 1, 2008
1 parent a328106 commit 5aa9931
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 53a9bf4267b8b1f958dbeb7c8c1ef21c82229b71
refs/heads/master: 74e27e44b0407fb1f6e8d1f7b7818f108463c4b8
4 changes: 1 addition & 3 deletions trunk/drivers/pci/pci-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 5aa9931

Please sign in to comment.