IB/ipath: Fix SDMA error recovery in absence of link status change

[linux-2.6-omap-h63xx.git] / include / linux / percpu.h

diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 00412bb494c40b100bc1e996983b72ba877ccf69..d746a2abb322590a7e891762638e774ec0efe2b5 100644 (file)
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -4,15 +4,10 @@
 #include <linux/preempt.h>
 #include <linux/slab.h> /* For kmalloc() */
 #include <linux/smp.h>
-#include <linux/string.h> /* For memset() */
 #include <linux/cpumask.h>
 
 #include <asm/percpu.h>
 
-#ifndef PER_CPU_ATTRIBUTES
-#define PER_CPU_ATTRIBUTES
-#endif
-
 #ifdef CONFIG_SMP
 #define DEFINE_PER_CPU(type, name)                                     \
        __attribute__((__section__(".data.percpu")))                    \
@@ -58,7 +53,7 @@
 #ifdef CONFIG_SMP
 
 struct percpu_data {
-       void *ptrs[NR_CPUS];
+       void *ptrs[1];
 };
 
 #define __percpu_disguise(pdata) (struct percpu_data *)~(unsigned long)(pdata)