From a5aa7fe1f5f1d2b98dbc6ff1a92831ec72458e8a Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Sat, 10 Mar 2012 23:28:46 -0800
Subject: [PATCH] --- yaml --- r: 299319 b: refs/heads/master c:
 85d6725b7c0d7e3fa4261fdd4c020be4224fc9f1 h: refs/heads/master i:   299317:
 de26ca987c5816a81b988a7a43e53d517bf4115e   299315:
 e0af30102a6e8bdb63e86dc2a424a6b2756467e9   299311:
 33b02ed35e1a396709e69434bc5b6bf8346c1112 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ata/libata-core.c | 4 ++--
 trunk/drivers/ata/libata-scsi.c | 4 ++--
 trunk/drivers/ata/libata.h      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d27a7dace5b2..be7ddcd5eae3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99b80e97710ae2e53c951acfdd956e9f38e36646
+refs/heads/master: 85d6725b7c0d7e3fa4261fdd4c020be4224fc9f1
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
index e0bda9ff89cd..28db50b57b91 100644
--- a/trunk/drivers/ata/libata-core.c
+++ b/trunk/drivers/ata/libata-core.c
@@ -95,7 +95,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
 static void ata_dev_xfermask(struct ata_device *dev);
 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
 
-unsigned int ata_print_id = 1;
+atomic_t ata_print_id = ATOMIC_INIT(1);
 
 struct ata_force_param {
 	const char	*name;
@@ -6029,7 +6029,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
 
 	/* give ports names and add SCSI hosts */
 	for (i = 0; i < host->n_ports; i++)
-		host->ports[i]->print_id = ata_print_id++;
+		host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
 
 
 	/* Create associated sysfs transport objects  */
diff --git a/trunk/drivers/ata/libata-scsi.c b/trunk/drivers/ata/libata-scsi.c
index 1ee00c8b5b04..93dabdcd2cbe 100644
--- a/trunk/drivers/ata/libata-scsi.c
+++ b/trunk/drivers/ata/libata-scsi.c
@@ -3843,7 +3843,7 @@ int ata_sas_async_port_init(struct ata_port *ap)
 	int rc = ap->ops->port_start(ap);
 
 	if (!rc) {
-		ap->print_id = ata_print_id++;
+		ap->print_id = atomic_inc_return(&ata_print_id);
 		__ata_port_probe(ap);
 	}
 
@@ -3867,7 +3867,7 @@ int ata_sas_port_init(struct ata_port *ap)
 	int rc = ap->ops->port_start(ap);
 
 	if (!rc) {
-		ap->print_id = ata_print_id++;
+		ap->print_id = atomic_inc_return(&ata_print_id);
 		rc = ata_port_probe(ap);
 	}
 
diff --git a/trunk/drivers/ata/libata.h b/trunk/drivers/ata/libata.h
index 2e26fcaf635b..9d0fd0b71852 100644
--- a/trunk/drivers/ata/libata.h
+++ b/trunk/drivers/ata/libata.h
@@ -53,7 +53,7 @@ enum {
 	ATA_DNXFER_QUIET	= (1 << 31),
 };
 
-extern unsigned int ata_print_id;
+extern atomic_t ata_print_id;
 extern int atapi_passthru16;
 extern int libata_fua;
 extern int libata_noacpi;