Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

3 files changed, 8 insertions, 7 deletions

diff --git a/arch/parisc/lib/bitops.c b/arch/parisc/lib/bitops.c
index e3eb739fab19..353963d42059 100644
--- a/arch/parisc/lib/bitops.c
+++ b/arch/parisc/lib/bitops.c
@@ -12,8 +12,8 @@
 #include <asm/atomic.h>
 
 #ifdef CONFIG_SMP
-raw_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned = {
-        [0 ... (ATOMIC_HASH_SIZE-1)]  = __RAW_SPIN_LOCK_UNLOCKED
+arch_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned = {
+        [0 ... (ATOMIC_HASH_SIZE-1)]  = __ARCH_SPIN_LOCK_UNLOCKED
 };
 #endif
 
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S
index d172d4245cdc..f8c45cc2947d 100644
--- a/arch/parisc/lib/fixup.S
+++ b/arch/parisc/lib/fixup.S
@@ -36,8 +36,8 @@
 #endif
         /* t2 = &__per_cpu_offset[smp_processor_id()]; */
         LDREGX \t2(\t1),\t2 
-        addil LT%per_cpu__exception_data,%r27
-        LDREG RT%per_cpu__exception_data(%r1),\t1
+        addil LT%exception_data,%r27
+        LDREG RT%exception_data(%r1),\t1
         /* t1 = &__get_cpu_var(exception_data) */
         add,l \t1,\t2,\t1
         /* t1 = t1->fault_ip */
@@ -46,8 +46,8 @@
 #else
         .macro  get_fault_ip t1 t2
         /* t1 = &__get_cpu_var(exception_data) */
-        addil LT%per_cpu__exception_data,%r27
-        LDREG RT%per_cpu__exception_data(%r1),\t2
+        addil LT%exception_data,%r27
+        LDREG RT%exception_data(%r1),\t2
         /* t1 = t2->fault_ip */
         LDREG EXCDATA_IP(\t2), \t1
         .endm
diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c
index abf41f4632a9..1dbca5c31b3c 100644
--- a/arch/parisc/lib/memcpy.c
+++ b/arch/parisc/lib/memcpy.c
@@ -475,7 +475,8 @@ unsigned long copy_to_user(void __user *dst, const void *src, unsigned long len)
         return pa_memcpy((void __force *)dst, src, len);
 }
 
-unsigned long copy_from_user(void *dst, const void __user *src, unsigned long len)
+EXPORT_SYMBOL(__copy_from_user);
+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long len)
 {
         mtsp(get_user_space(), 1);
         mtsp(get_kernel_space(), 2);