From 9674d8cb4c913585616543e14929b54486bfd3e3 Mon Sep 17 00:00:00 2001 From: Joshua Roys Date: Wed, 24 Feb 2010 18:52:44 -0500 Subject: [PATCH] --- yaml --- r: 180776 b: refs/heads/master c: c36f74e67fa12202dbcb4ad92c5ac844f9d36b98 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/ahci.c | 12 ++---------- trunk/security/selinux/ss/ebitmap.c | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 430f971665b4..bdc33d163d9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7491612c7d2cf560bb96dc02bb53d555b41adbb8 +refs/heads/master: c36f74e67fa12202dbcb4ad92c5ac844f9d36b98 diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c index a6a736a7dbf2..b34390347c16 100644 --- a/trunk/drivers/ata/ahci.c +++ b/trunk/drivers/ata/ahci.c @@ -3082,16 +3082,8 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ahci_save_initial_config(pdev, hpriv); /* prepare host */ - if (hpriv->cap & HOST_CAP_NCQ) { - pi.flags |= ATA_FLAG_NCQ; - /* Auto-activate optimization is supposed to be supported on - all AHCI controllers indicating NCQ support, but it seems - to be broken at least on some NVIDIA MCP79 chipsets. - Until we get info on which NVIDIA chipsets don't have this - issue, if any, disable AA on all NVIDIA AHCIs. */ - if (pdev->vendor != PCI_VENDOR_ID_NVIDIA) - pi.flags |= ATA_FLAG_FPDMA_AA; - } + if (hpriv->cap & HOST_CAP_NCQ) + pi.flags |= ATA_FLAG_NCQ | ATA_FLAG_FPDMA_AA; if (hpriv->cap & HOST_CAP_PMP) pi.flags |= ATA_FLAG_PMP; diff --git a/trunk/security/selinux/ss/ebitmap.c b/trunk/security/selinux/ss/ebitmap.c index 68c7348d1acc..04b6145d767f 100644 --- a/trunk/security/selinux/ss/ebitmap.c +++ b/trunk/security/selinux/ss/ebitmap.c @@ -128,7 +128,7 @@ int ebitmap_netlbl_export(struct ebitmap *ebmap, cmap_idx = delta / NETLBL_CATMAP_MAPSIZE; cmap_sft = delta % NETLBL_CATMAP_MAPSIZE; c_iter->bitmap[cmap_idx] - |= e_iter->maps[cmap_idx] << cmap_sft; + |= e_iter->maps[i] << cmap_sft; } e_iter = e_iter->next; }