From dc5911eda39dec77a8f9ac7032ba7ec4814beab2 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Tue, 2 Feb 2010 14:39:15 +0900
Subject: [PATCH] --- yaml --- r: 185023 b: refs/heads/master c:
 a29d8b8e2d811a24bbe49215a0f0c536b72ebc18 h: refs/heads/master i:   185021:
 793a9ac4201f4844b9d7e9f8e1c713e9e4df36de   185019:
 fda63a258ef2fb631ee3297137f1c26bc747ea5e   185015:
 81eabd4253c588a6d2034cb62febd9aff0a42a64   185007:
 1221306828aaae2571dc855bde48d063179c9f4e   184991:
 952539bb437949e702f086a893f68dc6ab7981ec   184959:
 aa4074a16cd842a8608e73a295def644112298d2 v: v3

---
 [refs]                                 | 2 +-
 trunk/crypto/cryptd.c                  | 2 +-
 trunk/drivers/acpi/processor_perflib.c | 2 +-
 trunk/drivers/dma/dmaengine.c          | 2 +-
 trunk/drivers/edac/amd64_edac.c        | 2 +-
 trunk/drivers/md/raid5.c               | 2 +-
 trunk/drivers/md/raid5.h               | 2 +-
 trunk/include/acpi/processor.h         | 2 +-
 trunk/include/linux/dmaengine.h        | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index f33b5598c1e1..b8d3ba3a01e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 003cb608a2533d0927a83bc4e07e46d7a622eda9
+refs/heads/master: a29d8b8e2d811a24bbe49215a0f0c536b72ebc18
diff --git a/trunk/crypto/cryptd.c b/trunk/crypto/cryptd.c
index 704c14115323..ef71318976c7 100644
--- a/trunk/crypto/cryptd.c
+++ b/trunk/crypto/cryptd.c
@@ -31,7 +31,7 @@ struct cryptd_cpu_queue {
 };
 
 struct cryptd_queue {
-	struct cryptd_cpu_queue *cpu_queue;
+	struct cryptd_cpu_queue __percpu *cpu_queue;
 };
 
 struct cryptd_instance_ctx {
diff --git a/trunk/drivers/acpi/processor_perflib.c b/trunk/drivers/acpi/processor_perflib.c
index 2cabadcc4d8c..8c6a6497d7f3 100644
--- a/trunk/drivers/acpi/processor_perflib.c
+++ b/trunk/drivers/acpi/processor_perflib.c
@@ -557,7 +557,7 @@ static int acpi_processor_get_psd(struct acpi_processor	*pr)
 }
 
 int acpi_processor_preregister_performance(
-		struct acpi_processor_performance *performance)
+		struct acpi_processor_performance __percpu *performance)
 {
 	int count, count_target;
 	int retval = 0;
diff --git a/trunk/drivers/dma/dmaengine.c b/trunk/drivers/dma/dmaengine.c
index 6f51a0a7a8bb..4eadd98cea53 100644
--- a/trunk/drivers/dma/dmaengine.c
+++ b/trunk/drivers/dma/dmaengine.c
@@ -284,7 +284,7 @@ struct dma_chan_tbl_ent {
 /**
  * channel_table - percpu lookup table for memory-to-memory offload providers
  */
-static struct dma_chan_tbl_ent *channel_table[DMA_TX_TYPE_END];
+static struct dma_chan_tbl_ent __percpu *channel_table[DMA_TX_TYPE_END];
 
 static int __init dma_channel_table_init(void)
 {
diff --git a/trunk/drivers/edac/amd64_edac.c b/trunk/drivers/edac/amd64_edac.c
index 000dc67b85b7..7b36c8838b2f 100644
--- a/trunk/drivers/edac/amd64_edac.c
+++ b/trunk/drivers/edac/amd64_edac.c
@@ -13,7 +13,7 @@ module_param(report_gart_errors, int, 0644);
 static int ecc_enable_override;
 module_param(ecc_enable_override, int, 0644);
 
-static struct msr *msrs;
+static struct msr __percpu *msrs;
 
 /* Lookup table for all possible MC control instances */
 struct amd64_pvt;
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index e84204eb12df..77cb3ab4bf45 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -4680,7 +4680,7 @@ static int raid5_alloc_percpu(raid5_conf_t *conf)
 {
 	unsigned long cpu;
 	struct page *spare_page;
-	struct raid5_percpu *allcpus;
+	struct raid5_percpu __percpu *allcpus;
 	void *scribble;
 	int err;
 
diff --git a/trunk/drivers/md/raid5.h b/trunk/drivers/md/raid5.h
index dd708359b451..0f86f5e36724 100644
--- a/trunk/drivers/md/raid5.h
+++ b/trunk/drivers/md/raid5.h
@@ -405,7 +405,7 @@ struct raid5_private_data {
 					      * lists and performing address
 					      * conversions
 					      */
-	} *percpu;
+	} __percpu *percpu;
 	size_t			scribble_len; /* size of scribble region must be
 					       * associated with conf to handle
 					       * cpu hotplug while reshaping
diff --git a/trunk/include/acpi/processor.h b/trunk/include/acpi/processor.h
index 0ea5ef4eb6a9..477544fd8e9e 100644
--- a/trunk/include/acpi/processor.h
+++ b/trunk/include/acpi/processor.h
@@ -238,7 +238,7 @@ struct acpi_processor_errata {
 
 extern int acpi_processor_preregister_performance(struct
 						  acpi_processor_performance
-						  *performance);
+						  __percpu *performance);
 
 extern int acpi_processor_register_performance(struct acpi_processor_performance
 					       *performance, unsigned int cpu);
diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h
index 78784982b33e..21fd9b7c6a40 100644
--- a/trunk/include/linux/dmaengine.h
+++ b/trunk/include/linux/dmaengine.h
@@ -162,7 +162,7 @@ struct dma_chan {
 	struct dma_chan_dev *dev;
 
 	struct list_head device_node;
-	struct dma_chan_percpu *local;
+	struct dma_chan_percpu __percpu *local;
 	int client_count;
 	int table_count;
 	void *private;